@@ -31,10 +31,10 @@ define mk-sdk-repo-pkg-1
31
31
$(call sdk-repo-pkg-zip,$(1 ) ,$(2 ) ,$(3 ) ) : $(2 )
32
32
@echo "Building SDK repository package $(3 ) from $(notdir $(2 ) ) "
33
33
$(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 ) /*
35
35
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(1 ) ,$(2 ) ,$(3 ) ) )
36
36
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 ) ) )
38
38
endef
39
39
40
40
# Defines the rule to build an SDK repository package when the
@@ -52,10 +52,10 @@ define mk-sdk-repo-pkg-2
52
52
$(call sdk-repo-pkg-zip,$(1 ) ,$(2 ) ,$(3 ) ) : $(2 )
53
53
@echo "Building SDK repository package $(3 ) from $(notdir $(2 ) ) "
54
54
$(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 ) ) ) *
56
56
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(1 ) ,$(2 ) ,$(3 ) ) )
57
57
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 ) ) )
59
59
endef
60
60
61
61
# Defines the rule to build an SDK repository package when the
@@ -77,10 +77,10 @@ define mk-sdk-repo-pkg-3
77
77
$(call sdk-repo-pkg-zip,$(1 ) ,$(2 ) ,$(3 ) ) : $(2 )
78
78
@echo "Building SDK repository package $(3 ) from $(notdir $(2 ) ) "
79
79
$(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 ) ) ) *
81
81
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(1 ) ,$(2 ) ,$(3 ) ) )
82
82
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 ) ) )
84
84
endef
85
85
86
86
# Defines the rule to build an SDK sources package.
@@ -93,12 +93,12 @@ define mk-sdk-repo-sources
93
93
$(call sdk-repo-pkg-zip,$(1 ) ,$(2 ) ,$(3 ) ) : $(2 ) $(HOST_OUT ) /development/sdk/source_source.properties
94
94
@echo "Building SDK sources package"
95
95
$(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 ) .
99
99
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(1 ) ,$(2 ) ,$(3 ) ) )
100
100
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 ) ) )
102
102
endef
103
103
104
104
# -----------------------------------------------------------------
@@ -113,10 +113,11 @@ SDK_EXTRAS_XML_ARGS := $(SDK_REPO_XML_ARGS)
113
113
SDK_REPO_XML_ARGS :=
114
114
115
115
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)
117
117
118
118
119
119
$(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))
120
121
$(eval $(call mk-sdk-repo-pkg-1,$(HOST_OS),$(MAIN_SDK_ZIP),platform-tools))
121
122
$(eval $(call mk-sdk-repo-pkg-1,$(HOST_OS),$(MAIN_SDK_ZIP),docs))
122
123
$(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-
125
126
$(eval $(call mk-sdk-repo-sources,$(HOST_OS),$(MAIN_SDK_ZIP),sources))
126
127
127
128
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)
135
137
136
138
endif
137
139
@@ -142,28 +144,31 @@ ifneq ($(WIN_SDK_ZIP),)
142
144
143
145
# docs, platforms and samples have nothing OS-dependent right now.
144
146
$(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))
145
148
$(eval $(call mk-sdk-repo-pkg-1,windows,$(WIN_SDK_ZIP),platform-tools))
146
149
147
150
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)
150
154
151
155
endif
152
156
153
157
# -----------------------------------------------------------------
154
158
# Pickup the most recent xml schema for repository and add-on
155
159
156
160
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
+ ) )
161
165
162
166
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
+
167
172
168
173
# -----------------------------------------------------------------
169
174
# Rules for sdk addon
@@ -184,7 +189,7 @@ SDK_ADDON_XML := $(dir $(ADDON_SDK_ZIP))/addon.xml
184
189
185
190
$(SDK_ADDON_XML ) : $(ADDON_SDK_ZIP )
186
191
$(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 )
188
193
189
194
$(call dist-for-goals, sdk_repo, $(SDK_ADDON_XML))
190
195
@@ -200,7 +205,7 @@ ifneq ($(SDK_REPO_XML_ARGS),)
200
205
201
206
$(SDK_REPO_XML ) : $(SDK_REPO_DEPS )
202
207
$(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 )
204
209
205
210
$(call dist-for-goals, sdk_repo, $(SDK_REPO_XML))
206
211
@@ -215,7 +220,7 @@ ifneq ($(SDK_EXTRAS_XML_ARGS),)
215
220
216
221
$(SDK_EXTRAS_XML ) : $(SDK_EXTRAS_DEPS )
217
222
$(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 )
219
224
220
225
$(call dist-for-goals, sdk_repo, $(SDK_EXTRAS_XML))
221
226
0 commit comments