Skip to content

Commit 6d1249e

Browse files
ralf-at-androidGerrit Code Review
authored andcommitted
Merge "SDK: Generate build-tools package."
2 parents 4d49f47 + bc7c8c5 commit 6d1249e

File tree

8 files changed

+108
-62
lines changed

8 files changed

+108
-62
lines changed

build/sdk-windows-x86.atree

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,41 @@
2626
# are controled by sdk/build/tools.windows.atree.
2727
#
2828

29+
##############################################################################
30+
# Platform Tools Component
31+
##############################################################################
32+
2933
rm platform-tools/adb
3034
rm platform-tools/fastboot
3135
bin/adb.exe strip platform-tools/adb.exe
3236
bin/fastboot.exe strip platform-tools/fastboot.exe
3337
bin/AdbWinUsbApi.dll platform-tools/AdbWinUsbApi.dll
3438
bin/AdbWinApi.dll platform-tools/AdbWinApi.dll
3539

36-
rm platform-tools/aapt
37-
bin/aapt.exe strip platform-tools/aapt.exe
3840

39-
rm platform-tools/aidl
40-
bin/aidl.exe strip platform-tools/aidl.exe
41+
##############################################################################
42+
# Build Tools Component
43+
##############################################################################
44+
45+
rm build-tools/${PLATFORM_NAME}/aapt
46+
bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt.exe
47+
48+
rm build-tools/${PLATFORM_NAME}/aidl
49+
bin/aidl.exe strip build-tools/${PLATFORM_NAME}/aidl.exe
50+
51+
rm build-tools/${PLATFORM_NAME}/dx
52+
dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.bat
53+
rm build-tools/${PLATFORM_NAME}/dexdump
54+
bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe
55+
56+
rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
57+
bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe
4158

42-
rm platform-tools/dx
43-
dalvik/dx/etc/dx.bat platform-tools/dx.bat
4459

45-
rm platform-tools/dexdump
46-
bin/dexdump.exe strip platform-tools/dexdump.exe
4760

48-
rm platform-tools/llvm-rs-cc
49-
bin/llvm-rs-cc.exe strip platform-tools/llvm-rs-cc.exe
61+
##############################################################################
62+
# Docs Component
63+
##############################################################################
5064

5165
external/sonivox/docs/JET_Authoring_Guidelines.html docs/JetCreator/JET_Authoring_Guidelines.html
5266
external/sonivox/docs/JET_Authoring_Guidelines_files docs/JetCreator/JET_Authoring_Guidelines_files

build/sdk.atree

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,46 @@ development/docs/SDK_RELEASE_NOTES RELEASE_NOTES.html
3333
# doc redirect
3434
frameworks/base/docs/docs-redirect.html documentation.html
3535

36+
3637
##############################################################################
3738
# Platform Tools Component
3839
##############################################################################
3940

41+
sdk/files/sdk_files_NOTICE.txt platform-tools/NOTICE.txt
4042
development/sdk/plat_tools_source.properties platform-tools/source.properties
4143

4244
# host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
4345
bin/adb strip platform-tools/adb
44-
bin/aapt strip platform-tools/aapt
45-
bin/aidl strip platform-tools/aidl
4646
bin/fastboot strip platform-tools/fastboot
47-
bin/llvm-rs-cc strip platform-tools/llvm-rs-cc
48-
49-
# dx
50-
bin/dx platform-tools/dx
51-
bin/dexdump platform-tools/dexdump
52-
framework/dx.jar platform-tools/lib/dx.jar
53-
54-
# Framework include for Renderscript
55-
frameworks/rs/scriptc platform-tools/renderscript/include
56-
external/clang/lib/Headers platform-tools/renderscript/clang-include
57-
external/clang/LICENSE.TXT platform-tools/renderscript/clang-include/LICENSE.TXT
5847

5948
# API database for tools such as lint
6049
development/sdk/api-versions.xml platform-tools/api/api-versions.xml
6150

51+
52+
##############################################################################
53+
# Build Tools Component
54+
##############################################################################
55+
# Note that the build-tools sub-folder uses the platform-name as a placeholder
56+
# at build-time. Packaging will later change that to the actual build-tools
57+
# revision as specified in the source.properties.
58+
59+
sdk/files/sdk_files_NOTICE.txt build-tools/${PLATFORM_NAME}/NOTICE.txt
60+
development/sdk/build_tools_source.properties build-tools/${PLATFORM_NAME}/source.properties
61+
62+
# build tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
63+
bin/aapt strip build-tools/${PLATFORM_NAME}/aapt
64+
bin/aidl strip build-tools/${PLATFORM_NAME}/aidl
65+
# renderscript (cc + headers)
66+
bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/llvm-rs-cc
67+
frameworks/rs/scriptc build-tools/${PLATFORM_NAME}/renderscript/include
68+
external/clang/lib/Headers build-tools/${PLATFORM_NAME}/renderscript/clang-include
69+
external/clang/LICENSE.TXT build-tools/${PLATFORM_NAME}/renderscript/clang-include/LICENSE.TXT
70+
# dx
71+
bin/dx build-tools/${PLATFORM_NAME}/dx
72+
framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar
73+
bin/dexdump build-tools/${PLATFORM_NAME}/dexdump
74+
75+
6276
##############################################################################
6377
# Platform Component
6478
##############################################################################
@@ -70,8 +84,8 @@ ${HOST_OUT}/development/sdk/platform_source.properties platforms/${PLATFORM_NAME
7084
sdk/sdk-build.prop platforms/${PLATFORM_NAME}/build.prop
7185

7286
# the uper-jar file that apps link against. This is the public API
73-
${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar
74-
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar platforms/${PLATFORM_NAME}/uiautomator.jar
87+
${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar
88+
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar platforms/${PLATFORM_NAME}/uiautomator.jar
7589

7690
# the aidl precompiled include
7791
obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl
@@ -89,7 +103,7 @@ development/tools/emulator/skins/WXGA800 platforms/${PLATFORM_NAME}/skins/
89103
development/tools/emulator/skins/WXGA800-7in platforms/${PLATFORM_NAME}/skins/WXGA800-7in
90104

91105
# Platform SDK properties
92-
development/sdk/sdk.properties platforms/${PLATFORM_NAME}/sdk.properties
106+
development/sdk/sdk.properties platforms/${PLATFORM_NAME}/sdk.properties
93107

94108
# sdk.git Ant templates for project files
95109
development/tools/templates/AndroidManifest.template platforms/${PLATFORM_NAME}/templates/AndroidManifest.template
@@ -121,6 +135,7 @@ sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt
121135
sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/data/NOTICE.txt
122136
sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/skins/NOTICE.txt
123137

138+
124139
##############################################################################
125140
# System image Component
126141
##############################################################################
@@ -133,6 +148,7 @@ system/build.prop system-images/${PLATFORM_NAME}/${TARG
133148

134149
# Note: the kernel image is handled by sdk-android-<abi>.atree now.
135150

151+
136152
##############################################################################
137153
# Docs Component
138154
##############################################################################
@@ -180,7 +196,7 @@ development/samples/MultiResolution samples/${PLATFORM_NAME}/MultiRes
180196
development/samples/NotePad samples/${PLATFORM_NAME}/NotePad
181197
development/samples/RandomMusicPlayer samples/${PLATFORM_NAME}/RandomMusicPlayer
182198
development/samples/SpellChecker/SampleSpellCheckerService samples/${PLATFORM_NAME}/SpellChecker/SampleSpellCheckerService
183-
development/samples/SpellChecker/HelloSpellChecker samples/${PLATFORM_NAME}/SpellChecker/HelloSpellChecker
199+
development/samples/SpellChecker/HelloSpellChecker samples/${PLATFORM_NAME}/SpellChecker/HelloSpellChecker
184200
development/samples/SampleSyncAdapter samples/${PLATFORM_NAME}/SampleSyncAdapter
185201
development/samples/SearchableDictionary samples/${PLATFORM_NAME}/SearchableDictionary
186202
development/samples/SipDemo samples/${PLATFORM_NAME}/SipDemo
@@ -208,7 +224,7 @@ development/samples/XmlAdapters samples/${PLATFORM_NAME}/XmlAdapt
208224
development/samples/RenderScript/HelloCompute samples/${PLATFORM_NAME}/RenderScript/HelloCompute
209225

210226
# NOTICE files are copied by build/core/Makefile from sdk.git
211-
sdk/files/sdk_files_NOTICE.txt samples/${PLATFORM_NAME}/NOTICE.txt
227+
sdk/files/sdk_files_NOTICE.txt samples/${PLATFORM_NAME}/NOTICE.txt
212228

213229
##############################################################################
214230
# Add-on Folder
@@ -217,6 +233,7 @@ sdk/files/sdk_files_NOTICE.txt samples/${PLATFORM_NAME}/NOTICE.txt
217233
# empty add-on folder with just a readme copied from sdk.git
218234
sdk/files/README_add-ons.txt add-ons/README.txt
219235

236+
220237
##############################################################################
221238
# Extra Component: Support
222239
##############################################################################
@@ -243,9 +260,11 @@ frameworks/support/v7/gridlayout/res
243260
frameworks/support/v7/gridlayout/readme extras/android/support/v7/gridlayout/src/.readme
244261
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-gridlayout_intermediates/android-support-v7-gridlayout.jar extras/android/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
245262

263+
246264
##############################################################################
247265
# Tests Component
248266
##############################################################################
249267
framework/layoutlib-tests.jar tests/libtests/layoutlib-tests.jar
250268
system/app/ConnectivityTest.apk tests/emulator-test-apps/ConnectivityTest.apk
251269
system/app/GpsLocationTest.apk tests/emulator-test-apps/GpsLocationTest.apk
270+

build/tools/mk_sdk_repo_xml.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66

77
PROG_DIR=$(dirname $0)
88

9-
TYPES="tool platform-tool platform sample doc add-on system-image source support"
9+
TYPES="tool platform-tool build-tool platform sample doc add-on system-image source support"
1010
OSES="linux macosx windows any linux-x86 darwin"
1111

1212
TMP_DIR=$(mktemp -d -t sdkrepo.tmp.XXXXXXXX)
@@ -144,6 +144,7 @@ if [[ "$ROOT" == "sdk-repository" && "$XSD_VERSION" -ge 7 ]] ||
144144
[[ "$ROOT" == "sdk-addon" && "$XSD_VERSION" -ge 5 ]]; then
145145
FULL_REVISIONS=(
146146
tool revision
147+
build-tool revision
147148
platform-tool revision
148149
@ min-tools-rev
149150
@ min-platform-tools-rev
@@ -409,3 +410,4 @@ echo "</sdk:$ROOT>" >> "$OUT"
409410

410411
echo "## Validate XML against schema"
411412
xmllint --schema $SCHEMA "$OUT"
413+

build/tools/patch_windows_sdk.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ fi
7474
${TOPDIR}out/host/linux-x86/bin/atree -f ${TOPDIR}development/build/sdk-windows-x86.atree \
7575
-I $WIN_OUT_DIR/host/windows-x86 \
7676
-I ${TOPDIR:-.} \
77+
-v "PLATFORM_NAME=android-$PLATFORM_VERSION" \
7778
-o $TEMP_SDK_DIR
7879

7980
# Fix EOL chars to make window users happy - fix all files at the top level

build/tools/sdk_repo.mk

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ define mk-sdk-repo-pkg-1
3131
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)): $(2)
3232
@echo "Building SDK repository package $(3) from $(notdir $(2))"
3333
$(hide) cd $(basename $(2)) && \
34-
zip -9rq ../$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3))) $(3)/*
34+
zip -9rq ../$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3))) $(3)/*
3535
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
3636
SDK_REPO_XML_ARGS += $(3) $(1) \
37-
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)):$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
37+
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)):$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
3838
endef
3939

4040
# Defines the rule to build an SDK repository package when the
@@ -52,10 +52,10 @@ define mk-sdk-repo-pkg-2
5252
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)): $(2)
5353
@echo "Building SDK repository package $(3) from $(notdir $(2))"
5454
$(hide) cd $(basename $(2))/$(3) && \
55-
zip -9rq ../../$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3))) *
55+
zip -9rq ../../$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3))) *
5656
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
5757
SDK_REPO_XML_ARGS += $(3) $(1) \
58-
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)):$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
58+
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)):$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
5959
endef
6060

6161
# Defines the rule to build an SDK repository package when the
@@ -77,10 +77,10 @@ define mk-sdk-repo-pkg-3
7777
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)): $(2)
7878
@echo "Building SDK repository package $(3) from $(notdir $(2))"
7979
$(hide) cd $(basename $(2))/$(4) && \
80-
zip -9rq ../../../$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3))) *
80+
zip -9rq ../../../$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3))) *
8181
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
8282
SDK_REPO_XML_ARGS += $(3) $(1) \
83-
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)):$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
83+
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)):$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
8484
endef
8585

8686
# Defines the rule to build an SDK sources package.
@@ -93,12 +93,12 @@ define mk-sdk-repo-sources
9393
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)): $(2) $(HOST_OUT)/development/sdk/source_source.properties
9494
@echo "Building SDK sources package"
9595
$(hide) $(TOPDIR)development/build/tools/mk_sources_zip.py --exec-zip \
96-
$(HOST_OUT)/development/sdk/source_source.properties \
97-
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)) \
98-
$(TOPDIR).
96+
$(HOST_OUT)/development/sdk/source_source.properties \
97+
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)) \
98+
$(TOPDIR).
9999
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
100100
SDK_REPO_XML_ARGS += $(3) $(1) \
101-
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)):$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
101+
$(call sdk-repo-pkg-zip,$(1),$(2),$(3)):$(notdir $(call sdk-repo-pkg-zip,$(1),$(2),$(3)))
102102
endef
103103

104104
# -----------------------------------------------------------------
@@ -113,10 +113,11 @@ SDK_EXTRAS_XML_ARGS := $(SDK_REPO_XML_ARGS)
113113
SDK_REPO_XML_ARGS :=
114114

115115
SDK_EXTRAS_DEPS += \
116-
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),support)
116+
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),support)
117117

118118

119119
$(eval $(call mk-sdk-repo-pkg-1,$(HOST_OS),$(MAIN_SDK_ZIP),tools))
120+
$(eval $(call mk-sdk-repo-pkg-2,$(HOST_OS),$(MAIN_SDK_ZIP),build-tools))
120121
$(eval $(call mk-sdk-repo-pkg-1,$(HOST_OS),$(MAIN_SDK_ZIP),platform-tools))
121122
$(eval $(call mk-sdk-repo-pkg-1,$(HOST_OS),$(MAIN_SDK_ZIP),docs))
122123
$(eval $(call mk-sdk-repo-pkg-2,$(HOST_OS),$(MAIN_SDK_ZIP),platforms))
@@ -125,13 +126,14 @@ $(eval $(call mk-sdk-repo-pkg-3,$(HOST_OS),$(MAIN_SDK_ZIP),system-images,system-
125126
$(eval $(call mk-sdk-repo-sources,$(HOST_OS),$(MAIN_SDK_ZIP),sources))
126127

127128
SDK_REPO_DEPS += \
128-
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),tools) \
129-
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),platform-tools) \
130-
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),docs) \
131-
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),platforms) \
132-
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),samples) \
133-
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),system-images) \
134-
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),sources)
129+
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),tools) \
130+
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),build-tools) \
131+
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),platform-tools) \
132+
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),docs) \
133+
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),platforms) \
134+
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),samples) \
135+
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),system-images) \
136+
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),sources)
135137

136138
endif
137139

@@ -142,28 +144,31 @@ ifneq ($(WIN_SDK_ZIP),)
142144

143145
# docs, platforms and samples have nothing OS-dependent right now.
144146
$(eval $(call mk-sdk-repo-pkg-1,windows,$(WIN_SDK_ZIP),tools))
147+
$(eval $(call mk-sdk-repo-pkg-2,windows,$(WIN_SDK_ZIP),build-tools))
145148
$(eval $(call mk-sdk-repo-pkg-1,windows,$(WIN_SDK_ZIP),platform-tools))
146149

147150
SDK_REPO_DEPS += \
148-
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),tools) \
149-
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),platform-tools)
151+
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),tools) \
152+
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),build-tools) \
153+
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),platform-tools)
150154

151155
endif
152156

153157
# -----------------------------------------------------------------
154158
# Pickup the most recent xml schema for repository and add-on
155159

156160
SDK_REPO_XSD := \
157-
$(lastword \
158-
$(wildcard \
159-
$(TOPDIR)prebuilts/devtools/repository/sdk-repository-*.xsd \
160-
))
161+
$(lastword \
162+
$(wildcard \
163+
$(TOPDIR)prebuilts/devtools/repository/sdk-repository-*.xsd \
164+
))
161165

162166
SDK_ADDON_XSD := \
163-
$(lastword \
164-
$(wildcard \
165-
$(TOPDIR)prebuilts/devtools/repository/sdk-addon-*.xsd \
166-
))
167+
$(lastword \
168+
$(wildcard \
169+
$(TOPDIR)prebuilts/devtools/repository/sdk-addon-*.xsd \
170+
))
171+
167172

168173
# -----------------------------------------------------------------
169174
# Rules for sdk addon
@@ -184,7 +189,7 @@ SDK_ADDON_XML := $(dir $(ADDON_SDK_ZIP))/addon.xml
184189

185190
$(SDK_ADDON_XML): $(ADDON_SDK_ZIP)
186191
$(hide) $(TOPDIR)development/build/tools/mk_sdk_repo_xml.sh \
187-
$(SDK_ADDON_XML) $(SDK_ADDON_XSD) add-on $(HOST_OS) $(RENAMED_ADDON_ZIP)
192+
$(SDK_ADDON_XML) $(SDK_ADDON_XSD) add-on $(HOST_OS) $(RENAMED_ADDON_ZIP)
188193

189194
$(call dist-for-goals, sdk_repo, $(SDK_ADDON_XML))
190195

@@ -200,7 +205,7 @@ ifneq ($(SDK_REPO_XML_ARGS),)
200205

201206
$(SDK_REPO_XML): $(SDK_REPO_DEPS)
202207
$(hide) $(TOPDIR)development/build/tools/mk_sdk_repo_xml.sh \
203-
$(SDK_REPO_XML) $(SDK_REPO_XSD) $(SDK_REPO_XML_ARGS)
208+
$(SDK_REPO_XML) $(SDK_REPO_XSD) $(SDK_REPO_XML_ARGS)
204209

205210
$(call dist-for-goals, sdk_repo, $(SDK_REPO_XML))
206211

@@ -215,7 +220,7 @@ ifneq ($(SDK_EXTRAS_XML_ARGS),)
215220

216221
$(SDK_EXTRAS_XML): $(SDK_EXTRAS_DEPS)
217222
$(hide) $(TOPDIR)development/build/tools/mk_sdk_repo_xml.sh \
218-
$(SDK_EXTRAS_XML) $(SDK_ADDON_XSD) $(SDK_EXTRAS_XML_ARGS)
223+
$(SDK_EXTRAS_XML) $(SDK_ADDON_XSD) $(SDK_EXTRAS_XML_ARGS)
219224

220225
$(call dist-for-goals, sdk_repo, $(SDK_EXTRAS_XML))
221226

build/tools/windows_sdk.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,11 @@ $(WIN_SDK_ZIP): winsdk-tools sdk
8787
$(hide) mkdir -p $(WIN_SDK_DIR)
8888
$(hide) cp -rf $(MAIN_SDK_DIR)/$(MAIN_SDK_NAME) $(WIN_SDK_DIR)/$(WIN_SDK_NAME)
8989
$(hide) USB_DRIVER_HOOK=$(USB_DRIVER_HOOK) \
90+
PLATFORM_VERSION=$(PLATFORM_VERSION) \
9091
$(TOPDIR)development/build/tools/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
9192
$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
92-
$(hide) $(TOPDIR)sdk/build/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
93+
$(hide) PLATFORM_VERSION=$(PLATFORM_VERSION) \
94+
$(TOPDIR)sdk/build/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
9395
$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
9496
$(hide) ( \
9597
cd $(WIN_SDK_DIR) && \

sdk/build_tools_source.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Pkg.UserSrc=false
2+
Pkg.Revision=16.0.3
3+

sdk/plat_tools_source.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Pkg.UserSrc=false
2-
Pkg.Revision=16.0.2
2+
Pkg.Revision=16.0.3

0 commit comments

Comments
 (0)