f0407b3cb8
Instead of relying on xmllint from the path, with could come from the host, or sometimes a built version, always use the built version explicitly. This does some general cleanup of these make rules as well, using fewer global variables inside make rules, and cleaning variables up at the end of the file. I added some missing dependencies and removed some uses of $(TOPDIR) too. I did not clean up the uses of `zip` that make these rules non-deterministic, but I filed b/117562080 for that, since it could use some larger refactoring. Test: lunch sdk_arm64-userdebug; m sdk sdk_repo dist Change-Id: Ia0736d5fc7475603cf31f385b3ada11d9e775259
283 lines
9.9 KiB
Makefile
283 lines
9.9 KiB
Makefile
# Makefile to build the SDK repository packages.
|
|
|
|
.PHONY: sdk_repo
|
|
|
|
SDK_REPO_DEPS :=
|
|
SDK_REPO_XML_ARGS :=
|
|
SDK_EXTRAS_DEPS :=
|
|
SDK_EXTRAS_XML_ARGS :=
|
|
SDK_SYSIMG_DEPS :=
|
|
SDK_SYSIMG_XML_ARGS :=
|
|
|
|
# Define the name of a package zip file to generate
|
|
# $1=OS (e.g. linux-x86, windows, etc)
|
|
# $2=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip)
|
|
# $3=package to create (e.g. tools, docs, etc.)
|
|
#
|
|
define sdk-repo-pkg-zip
|
|
$(dir $(2))/sdk-repo-$(1)-$(3)-$(FILE_NAME_TAG).zip
|
|
endef
|
|
|
|
# Defines the rule to build an SDK repository package by zipping all
|
|
# the content of the given directory.
|
|
# E.g. given a folder out/host/linux.../sdk/android-eng-sdk/tools
|
|
# this generates an sdk-repo-linux-tools that contains tools/*
|
|
#
|
|
# $1=variable where to accumulate args for mk_sdk_repo_xml.
|
|
# $2=OS (e.g. linux-x86, windows, etc)
|
|
# $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip)
|
|
# $4=package to create (e.g. tools, docs, etc.)
|
|
#
|
|
# The rule depends on the SDK zip file, which is defined by $2.
|
|
#
|
|
define mk-sdk-repo-pkg-1
|
|
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3)
|
|
@echo "Building SDK repository package $(4) from $(notdir $(3))"
|
|
$(hide) cd $(basename $(3)) && \
|
|
rm -f ../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) && \
|
|
zip -9rq ../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) $(4)/*
|
|
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
|
|
$(1) += $(4) $(2) \
|
|
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)):$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
|
|
endef
|
|
|
|
# Defines the rule to build an SDK repository package when the
|
|
# package directory contains a single platform-related inner directory.
|
|
# E.g. given a folder out/host/linux.../sdk/android-eng-sdk/samples/android-N
|
|
# this generates an sdk-repo-linux-samples that contains android-N/*
|
|
#
|
|
# $1=variable where to accumulate args for mk_sdk_repo_xml.
|
|
# $2=OS (e.g. linux-x86, windows, etc)
|
|
# $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip)
|
|
# $4=package to create (e.g. platforms, samples, etc.)
|
|
#
|
|
# The rule depends on the SDK zip file, which is defined by $2.
|
|
#
|
|
define mk-sdk-repo-pkg-2
|
|
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3)
|
|
@echo "Building SDK repository package $(4) from $(notdir $(3))"
|
|
$(hide) cd $(basename $(3))/$(4) && \
|
|
rm -f ../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) && \
|
|
zip -9rq ../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) *
|
|
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
|
|
$(1) += $(4) $(2) \
|
|
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)):$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
|
|
endef
|
|
|
|
# Defines the rule to build an SDK repository package when the
|
|
# package directory contains 3 levels from the sdk dir, for example
|
|
# to package SDK/extra/android/support or SDK/system-images/android-N/armeabi.
|
|
# Because we do not know the intermediary directory name, this only works
|
|
# if each directory contains a single sub-directory (e.g. sdk/$4/*/* must be
|
|
# unique.)
|
|
#
|
|
# $1=variable where to accumulate args for mk_sdk_repo_xml.
|
|
# $2=OS (e.g. linux-x86, windows, etc)
|
|
# $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip)
|
|
# $4=package to create (e.g. system-images, support, etc.)
|
|
# $5=the root of directory to package in the sdk (e.g. extra/android).
|
|
# this must be a 2-segment path, the last one can be *.
|
|
#
|
|
# The rule depends on the SDK zip file, which is defined by $2.
|
|
#
|
|
define mk-sdk-repo-pkg-3
|
|
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3)
|
|
@echo "Building SDK repository package $(4) from $(notdir $(3))"
|
|
$(hide) cd $(basename $(3))/$(5) && \
|
|
rm -f ../../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) && \
|
|
zip -9rq ../../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) *
|
|
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
|
|
$(1) += $(4) $(2) \
|
|
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)):$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
|
|
endef
|
|
|
|
# Defines the rule to build an SDK sources package.
|
|
#
|
|
# $1=variable where to accumulate args for mk_sdk_repo_xml.
|
|
# $2=OS (e.g. linux-x86, windows, etc)
|
|
# $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip)
|
|
# $4=package to create, must be "sources"
|
|
#
|
|
define mk-sdk-repo-sources
|
|
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3) development/build/tools/mk_sources_zip.py $(HOST_OUT)/development/sdk/source_source.properties
|
|
@echo "Building SDK sources package"
|
|
development/build/tools/mk_sources_zip.py --exec-zip \
|
|
$(HOST_OUT)/development/sdk/source_source.properties \
|
|
$$@ .
|
|
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
|
|
$(1) += $(4) $(2) \
|
|
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)):$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
|
|
endef
|
|
|
|
# Defines the rule to build an XML file for a package.
|
|
#
|
|
# $1=output file
|
|
# $2=schema file
|
|
# $3=deps
|
|
# $4=args
|
|
define mk-sdk-repo-xml
|
|
$(1): $$(XMLLINT) development/build/tools/mk_sdk_repo_xml.sh $(2) $(3)
|
|
XMLLINT=$$(XMLLINT) development/build/tools/mk_sdk_repo_xml.sh $$@ $(2) $(4)
|
|
|
|
$$(call dist-for-goals,sdk_repo,$(1))
|
|
endef
|
|
|
|
# -----------------------------------------------------------------
|
|
# Rules for main host sdk
|
|
|
|
ifneq ($(filter sdk win_sdk,$(MAKECMDGOALS)),)
|
|
|
|
# Similarly capture all sys-img.xml that are now split out of repository.xml
|
|
$(eval $(call mk-sdk-repo-pkg-3,SDK_SYSIMG_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),system-images,system-images/*))
|
|
|
|
SDK_SYSIMG_DEPS += \
|
|
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),system-images) \
|
|
|
|
# All these go in the main repository.xml
|
|
$(eval $(call mk-sdk-repo-pkg-2,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),build-tools))
|
|
$(eval $(call mk-sdk-repo-pkg-1,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),platform-tools))
|
|
$(eval $(call mk-sdk-repo-pkg-1,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),docs))
|
|
$(eval $(call mk-sdk-repo-pkg-2,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),platforms))
|
|
$(eval $(call mk-sdk-repo-pkg-2,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),samples))
|
|
$(eval $(call mk-sdk-repo-sources,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),sources))
|
|
|
|
SDK_REPO_DEPS += \
|
|
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),build-tools) \
|
|
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),platform-tools) \
|
|
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),docs) \
|
|
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),platforms) \
|
|
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),samples) \
|
|
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),sources)
|
|
|
|
endif
|
|
|
|
# -----------------------------------------------------------------
|
|
# Rules for win_sdk
|
|
|
|
ifneq ($(WIN_SDK_ZIP),)
|
|
|
|
# docs, platforms and samples have nothing OS-dependent right now.
|
|
$(eval $(call mk-sdk-repo-pkg-2,SDK_REPO_XML_ARGS,windows,$(WIN_SDK_ZIP),build-tools))
|
|
$(eval $(call mk-sdk-repo-pkg-1,SDK_REPO_XML_ARGS,windows,$(WIN_SDK_ZIP),platform-tools))
|
|
|
|
SDK_REPO_DEPS += \
|
|
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),build-tools) \
|
|
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),platform-tools)
|
|
|
|
endif
|
|
|
|
# -----------------------------------------------------------------
|
|
# Pickup the most recent xml schema for repository and add-on
|
|
|
|
SDK_REPO_XSD := \
|
|
$(lastword \
|
|
$(wildcard \
|
|
prebuilts/devtools/repository/sdk-repository-*.xsd \
|
|
))
|
|
|
|
SDK_ADDON_XSD := \
|
|
$(lastword \
|
|
$(wildcard \
|
|
prebuilts/devtools/repository/sdk-addon-*.xsd \
|
|
))
|
|
|
|
SDK_SYSIMG_XSD := \
|
|
$(lastword \
|
|
$(wildcard \
|
|
prebuilts/devtools/repository/sdk-sys-img-*.xsd \
|
|
))
|
|
|
|
|
|
# -----------------------------------------------------------------
|
|
# Rules for sdk addon
|
|
|
|
ifneq ($(filter sdk_addon,$(MAKECMDGOALS)),)
|
|
ifneq ($(ADDON_SDK_ZIP),)
|
|
|
|
# ADDON_SDK_ZIP is defined in build/core/tasks/sdk-addon.sh and is
|
|
# already packaged correctly. All we have to do is dist it with
|
|
# a different destination name.
|
|
|
|
RENAMED_ADDON_ZIP := $(ADDON_SDK_ZIP):$(notdir $(call sdk-repo-pkg-zip,$(HOST_OS),$(ADDON_SDK_ZIP),addon))
|
|
|
|
$(call dist-for-goals, sdk_repo, $(RENAMED_ADDON_ZIP))
|
|
|
|
# Also generate the addon.xml using the latest schema and the renamed addon zip
|
|
|
|
SDK_ADDON_XML := $(dir $(ADDON_SDK_ZIP))/addon.xml
|
|
|
|
$(eval $(call mk-sdk-repo-xml,$(SDK_ADDON_XML),$(SDK_ADDON_XSD),$(ADDON_SDK_ZIP),add-on $(HOST_OS) $(RENAMED_ADDON_ZIP)))
|
|
|
|
SDK_ADDON_XML :=
|
|
RENAMED_ADDON_ZIP :=
|
|
|
|
endif
|
|
|
|
ifneq ($(ADDON_SDK_IMG_ZIP),)
|
|
|
|
# Copy/rename the ADDON_SDK_IMG_ZIP file as an sdk-repo zip in the dist dir
|
|
|
|
RENAMED_ADDON_IMG_ZIP := $(ADDON_SDK_IMG_ZIP):$(notdir $(call sdk-repo-pkg-zip,$(HOST_OS),$(ADDON_SDK_IMG_ZIP),system-images))
|
|
|
|
$(call dist-for-goals, sdk_repo, $(RENAMED_ADDON_IMG_ZIP))
|
|
|
|
# Generate the system-image XML for the addon sys-img
|
|
|
|
SDK_ADDON_IMG_XML := $(dir $(ADDON_SDK_ZIP))/addon-sys-img.xml
|
|
|
|
$(eval $(call mk-sdk-repo-xml,$(SDK_ADDON_IMG_XML),$(SDK_SYSIMG_XSD),$(ADDON_SDK_IMG_ZIP),system-image $(HOST_OS) $(RENAMED_ADDON_IMG_ZIP)))
|
|
|
|
SDK_ADDON_IMG_XML :=
|
|
RENAMED_ADDON_IMG_ZIP :=
|
|
|
|
endif
|
|
endif
|
|
|
|
# -----------------------------------------------------------------
|
|
# Rules for the SDK Repository XML
|
|
|
|
SDK_REPO_XML := $(MAIN_SDK_DIR)/repository.xml
|
|
SDK_EXTRAS_XML := $(MAIN_SDK_DIR)/repo-extras.xml
|
|
SDK_SYSIMG_XML := $(MAIN_SDK_DIR)/repo-sys-img.xml
|
|
|
|
ifneq ($(SDK_REPO_XML_ARGS),)
|
|
$(eval $(call mk-sdk-repo-xml,$(SDK_REPO_XML),$(SDK_REPO_XSD),$(SDK_REPO_DEPS),$(SDK_REPO_XML_ARGS)))
|
|
else
|
|
SDK_REPO_XML :=
|
|
endif
|
|
|
|
|
|
ifneq ($(SDK_EXTRAS_XML_ARGS),)
|
|
$(eval $(call mk-sdk-repo-xml,$(SDK_EXTRAS_XML),$(SDK_ADDON_XSD),$(SDK_EXTRAS_DEPS),$(SDK_EXTRAS_XML_ARGS)))
|
|
else
|
|
SDK_EXTRAS_XML :=
|
|
endif
|
|
|
|
|
|
ifneq ($(SDK_SYSIMG_XML_ARGS),)
|
|
$(eval $(call mk-sdk-repo-xml,$(SDK_SYSIMG_XML),$(SDK_SYSIMG_XSD),$(SDK_SYSIMG_DEPS),$(SDK_SYSIMG_XML_ARGS)))
|
|
else
|
|
SDK_SYSIMG_XML :=
|
|
endif
|
|
|
|
# -----------------------------------------------------------------
|
|
|
|
sdk_repo: $(SDK_REPO_DEPS) $(SDK_REPO_XML) $(SDK_EXTRAS_XML) $(SDK_SYSIMG_XML)
|
|
|
|
SDK_REPO_DEPS :=
|
|
SDK_REPO_XML :=
|
|
SDK_REPO_XML_ARGS :=
|
|
SDK_EXTRAS_DEPS :=
|
|
SDK_EXTRAS_XML :=
|
|
SDK_EXTRAS_XML_ARGS :=
|
|
SDK_SYSIMG_DEPS :=
|
|
SDK_SYSIMG_XML :=
|
|
SDK_SYSIMG_XML_ARGS :=
|
|
|
|
mk-sdk-repo-pkg-1 :=
|
|
mk-sdk-repo-pkg-2 :=
|
|
mk-sdk-repo-pkg-3 :=
|
|
mk-sdk-repo-sources :=
|
|
mk-sdk-repo-xml :=
|
|
sdk-repo-pkg-zip :=
|