Replace build/tools with build/make/tools (fdea8938) · Commits · e / os / android_build

core/Makefile

+26 −26

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ $(INSTALLED_DEFAULT_PROP_TARGET): $(intermediate_system_build_prop)
		$(hide) echo ro.bootimage.build.date=`$(DATE_FROM_FILE)`>>$@
		$(hide) echo ro.bootimage.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@
		$(hide) echo ro.bootimage.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@
		$(hide) build/tools/post_process_props.py $@
		$(hide) build/make/tools/post_process_props.py $@
		ifdef property_overrides_split_enabled
		$(hide) mkdir -p $(TARGET_ROOT_OUT)
		$(hide) ln -sf system/etc/prop.default $(INSTALLED_DEFAULT_PROP_OLD_TARGET)
		@@ -192,7 +192,7 @@ $(INSTALLED_VENDOR_DEFAULT_PROP_TARGET): $(INSTALLED_DEFAULT_PROP_TARGET)
		echo "#" >> $@;
		$(hide) $(foreach line,$(FINAL_VENDOR_DEFAULT_PROPERTIES), \
		echo "$(line)" >> $@;)
		$(hide) build/tools/post_process_props.py $@
		$(hide) build/make/tools/post_process_props.py $@

		endif # property_overrides_split_enabled

		@@ -284,8 +284,8 @@ define get-default-product-locale
		$(strip $(subst _,-, $(firstword $(1))))
		endef

		BUILDINFO_SH := build/tools/buildinfo.sh
		VENDOR_BUILDINFO_SH := build/tools/vendor_buildinfo.sh
		BUILDINFO_SH := build/make/tools/buildinfo.sh
		VENDOR_BUILDINFO_SH := build/make/tools/vendor_buildinfo.sh

		# TARGET_BUILD_FLAVOR and ro.build.flavor are used only by the test
		# harness to distinguish builds. Only add _asan for a sanitized build
		@@ -363,7 +363,7 @@ endif
		$(hide) $(foreach line,$(FINAL_BUILD_PROPERTIES), \
		echo "$(line)" >> $@;)
		$(hide) cat $(INSTALLED_ANDROID_INFO_TXT_TARGET) \| grep 'require version-' \| sed -e 's/require version-/ro.build.expect./g' >> $@
		$(hide) build/tools/post_process_props.py $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_PROPERTY_BLACKLIST)
		$(hide) build/make/tools/post_process_props.py $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_PROPERTY_BLACKLIST)

		build_desc :=

		@@ -416,7 +416,7 @@ ifdef property_overrides_split_enabled
		echo "#" >> $@;
		$(hide) $(foreach line,$(FINAL_VENDOR_BUILD_PROPERTIES), \
		echo "$(line)" >> $@;)
		$(hide) build/tools/post_process_props.py $@
		$(hide) build/make/tools/post_process_props.py $@
		endif # property_overrides_split_enabled

		# ----------------------------------------------------------------
		@@ -461,7 +461,7 @@ ifeq ($(PACKAGES_TO_STAT),)
		# Create empty package stats file if target builds no jar(s) or apk(s).
		$(hide) touch $@
		else
		$(hide) build/tools/dump-package-stats $^ > $@
		$(hide) build/make/tools/dump-package-stats $^ > $@
		endif

		.PHONY: package-stats
		@@ -523,7 +523,7 @@ $(SOONG_CONV_DATA):
		@rm -f $@
		@$(foreach s,$(SOONG_CONV),echo "$(s),$(SOONG_CONV.$(s).TYPE),$(sort $(SOONG_CONV.$(s).PROBLEMS)),$(sort $(filter-out $(SOONG_ALREADY_CONV),$(SOONG_CONV.$(s).DEPS)))" >>$@;)

		SOONG_TO_CONVERT_SCRIPT := build/tools/soong_to_convert.py
		SOONG_TO_CONVERT_SCRIPT := build/make/tools/soong_to_convert.py
		SOONG_TO_CONVERT := $(PRODUCT_OUT)/soong_to_convert.txt
		$(SOONG_TO_CONVERT): $(SOONG_CONV_DATA) $(SOONG_TO_CONVERT_SCRIPT)
		@rm -f $@
		@@ -576,7 +576,7 @@ all_event_log_tags_src := \
		pdk_fusion_log_tags_file := $(patsubst $(PRODUCT_OUT)/%,$(_pdk_fusion_intermediates)/%,$(filter $(event_log_tags_file),$(ALL_PDK_FUSION_FILES)))

		$(all_event_log_tags_file): PRIVATE_SRC_FILES := $(all_event_log_tags_src) $(pdk_fusion_log_tags_file)
		$(all_event_log_tags_file): $(all_event_log_tags_src) $(pdk_fusion_log_tags_file) $(MERGETAGS) build/tools/event_log_tags.py
		$(all_event_log_tags_file): $(all_event_log_tags_src) $(pdk_fusion_log_tags_file) $(MERGETAGS) build/make/tools/event_log_tags.py
		$(hide) mkdir -p $(dir $@)
		$(hide) $(MERGETAGS) -o $@ $(PRIVATE_SRC_FILES)

		@@ -592,7 +592,7 @@ event_log_tags_src := \

		$(event_log_tags_file): PRIVATE_SRC_FILES := $(event_log_tags_src) $(pdk_fusion_log_tags_file)
		$(event_log_tags_file): PRIVATE_MERGED_FILE := $(all_event_log_tags_file)
		$(event_log_tags_file): $(event_log_tags_src) $(all_event_log_tags_file) $(pdk_fusion_log_tags_file) $(MERGETAGS) build/tools/event_log_tags.py
		$(event_log_tags_file): $(event_log_tags_src) $(all_event_log_tags_file) $(pdk_fusion_log_tags_file) $(MERGETAGS) build/make/tools/event_log_tags.py
		$(hide) mkdir -p $(dir $@)
		$(hide) $(MERGETAGS) -o $@ -m $(PRIVATE_MERGED_FILE) $(PRIVATE_SRC_FILES)

		@@ -817,8 +817,8 @@ define combine-notice-files
		$(2) $(3): PRIVATE_MESSAGE := $(4)
		$(2) $(3): PRIVATE_DIR := $(5)
		$(2) : $(3)
		$(3) : $(6) $(BUILD_SYSTEM)/Makefile build/tools/generate-notice-files.py
		build/tools/generate-notice-files.py --text-output $(2) \
		$(3) : $(6) $(BUILD_SYSTEM)/Makefile build/make/tools/generate-notice-files.py
		build/make/tools/generate-notice-files.py --text-output $(2) \
		$(if $(filter $(1),xml_excluded_vendor),-e vendor --xml-output, \
		$(if $(filter $(1),xml_vendor),-i vendor --xml-output, \
		--html-output)) $(3) \
		@@ -1413,7 +1413,7 @@ $(INSTALLED_FILES_FILE): $(FULL_SYSTEMIMAGE_DEPS) $(FILESLIST)
		@mkdir -p $(dir $@)
		@rm -f $@
		$(hide) $(FILESLIST) $(TARGET_OUT) > $(@:.txt=.json)
		$(hide) build/tools/fileslist_util.py -c $(@:.txt=.json) > $@
		$(hide) build/make/tools/fileslist_util.py -c $(@:.txt=.json) > $@

		.PHONY: installed-file-list
		installed-file-list: $(INSTALLED_FILES_FILE)
		@@ -1447,7 +1447,7 @@ define build-systemimage-target
		$(call generate-userimage-prop-dictionary, $(systemimage_intermediates)/system_image_info.txt, \
		skip_fsck=true)
		$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \
		./build/tools/releasetools/build_image.py \
		build/make/tools/releasetools/build_image.py \
		$(TARGET_OUT) $(systemimage_intermediates)/system_image_info.txt $(1) $(TARGET_OUT) \
		\|\| ( echo "Out of space? the tree size of $(TARGET_OUT) is (MB): " 1>&2 ;\
		du -sm $(TARGET_OUT) 1>&2;\
		@@ -1673,7 +1673,7 @@ define build-userdataimage-target
		@mkdir -p $(userdataimage_intermediates) && rm -rf $(userdataimage_intermediates)/userdata_image_info.txt
		$(call generate-userimage-prop-dictionary, $(userdataimage_intermediates)/userdata_image_info.txt, skip_fsck=true)
		$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \
		./build/tools/releasetools/build_image.py \
		build/make/tools/releasetools/build_image.py \
		$(TARGET_OUT_DATA) $(userdataimage_intermediates)/userdata_image_info.txt $(INSTALLED_USERDATAIMAGE_TARGET) $(TARGET_OUT)
		$(hide) $(call assert-max-image-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_PARTITION_SIZE))
		endef
		@@ -1780,7 +1780,7 @@ define build-cacheimage-target
		@mkdir -p $(cacheimage_intermediates) && rm -rf $(cacheimage_intermediates)/cache_image_info.txt
		$(call generate-userimage-prop-dictionary, $(cacheimage_intermediates)/cache_image_info.txt, skip_fsck=true)
		$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \
		./build/tools/releasetools/build_image.py \
		build/make/tools/releasetools/build_image.py \
		$(TARGET_OUT_CACHE) $(cacheimage_intermediates)/cache_image_info.txt $(INSTALLED_CACHEIMAGE_TARGET) $(TARGET_OUT)
		$(hide) $(call assert-max-image-size,$(INSTALLED_CACHEIMAGE_TARGET),$(BOARD_CACHEIMAGE_PARTITION_SIZE))
		endef
		@@ -1823,7 +1823,7 @@ $(INSTALLED_FILES_FILE_SYSTEMOTHER) : $(INTERNAL_SYSTEMOTHERIMAGE_FILES) $(FILES
		@mkdir -p $(dir $@)
		@rm -f $@
		$(hide) $(FILESLIST) $(TARGET_OUT_SYSTEM_OTHER) > $(@:.txt=.json)
		$(hide) build/tools/fileslist_util.py -c $(@:.txt=.json) > $@
		$(hide) build/make/tools/fileslist_util.py -c $(@:.txt=.json) > $@

		systemotherimage_intermediates := \
		$(call intermediates-dir-for,PACKAGING,system_other)
		@@ -1836,7 +1836,7 @@ define build-systemotherimage-target
		@mkdir -p $(systemotherimage_intermediates) && rm -rf $(systemotherimage_intermediates)/system_other_image_info.txt
		$(call generate-userimage-prop-dictionary, $(systemotherimage_intermediates)/system_other_image_info.txt, skip_fsck=true)
		$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \
		./build/tools/releasetools/build_image.py \
		build/make/tools/releasetools/build_image.py \
		$(TARGET_OUT_SYSTEM_OTHER) $(systemotherimage_intermediates)/system_other_image_info.txt $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) $(TARGET_OUT)
		$(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMOTHERIMAGE_TARGET),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
		endef
		@@ -1873,7 +1873,7 @@ $(INSTALLED_FILES_FILE_VENDOR) : $(INTERNAL_VENDORIMAGE_FILES) $(FILESLIST)
		@mkdir -p $(dir $@)
		@rm -f $@
		$(hide) $(FILESLIST) $(TARGET_OUT_VENDOR) > $(@:.txt=.json)
		$(hide) build/tools/fileslist_util.py -c $(@:.txt=.json) > $@
		$(hide) build/make/tools/fileslist_util.py -c $(@:.txt=.json) > $@

		vendorimage_intermediates := \
		$(call intermediates-dir-for,PACKAGING,vendor)
		@@ -1886,7 +1886,7 @@ define build-vendorimage-target
		$(if $(BOARD_VENDOR_KERNEL_MODULES), \
		$(call build-image-kernel-modules,$(BOARD_VENDOR_KERNEL_MODULES),$(TARGET_OUT_VENDOR),vendor/,$(call intermediates-dir-for,PACKAGING,depmod_vendor)))
		$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \
		./build/tools/releasetools/build_image.py \
		build/make/tools/releasetools/build_image.py \
		$(TARGET_OUT_VENDOR) $(vendorimage_intermediates)/vendor_image_info.txt $(INSTALLED_VENDORIMAGE_TARGET) $(TARGET_OUT)
		$(hide) $(call assert-max-image-size,$(INSTALLED_VENDORIMAGE_TARGET),$(BOARD_VENDORIMAGE_PARTITION_SIZE))
		endef
		@@ -2236,7 +2236,7 @@ OTATOOLS_DEPS := \
		-name \.x509.pem -o -name oem\.prop \| sort)

		OTATOOLS_RELEASETOOLS := \
		$(shell find build/tools/releasetools -name \*.pyc -prune -o -type f \| sort)
		$(shell find build/make/tools/releasetools -name \*.pyc -prune -o -type f \| sort)

		ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))
		OTATOOLS_DEPS += \
		@@ -2248,7 +2248,7 @@ $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) $(OTATOOLS_DEPS) $(OTATOOLS_RELEASETOOLS)
		$(hide) rm -rf $@ $(zip_root)
		$(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools
		$(call copy-files-with-structure,$(OTATOOLS),$(HOST_OUT)/,$(zip_root))
		$(hide) $(ACP) -r -d -p build/tools/releasetools/* $(zip_root)/releasetools
		$(hide) $(ACP) -r -d -p build/make/tools/releasetools/* $(zip_root)/releasetools
		$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
		$(hide) (cd $(zip_root) && zip -qryX $(abspath $@) *)
		$(hide) echo $(OTATOOLS_DEPS) \| xargs zip -qryX $(abspath $@)>/dev/null \|\| true
		@@ -2542,7 +2542,7 @@ endif
		$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)
		ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
		$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \
		./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root)
		build/make/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root)
		endif
		ifeq ($(AB_OTA_UPDATER),true)
		@# When using the A/B updater, include the updater config files in the zip.
		@@ -2641,7 +2641,7 @@ ifdef BUILT_VENDOR_MATRIX
		endif

		$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \
		./build/tools/releasetools/add_img_to_target_files -a -v -p $(HOST_OUT) $(zip_root)
		build/make/tools/releasetools/add_img_to_target_files -a -v -p $(HOST_OUT) $(zip_root)
		@# Zip everything up, preserving symlinks and placing META/ files first to
		@# help early validation of the .zip file while uploading it.
		$(hide) find $(zip_root)/META \| sort >$@.list
		@@ -2685,10 +2685,10 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BROTLI)
		endif

		$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) \
		build/tools/releasetools/ota_from_target_files
		build/make/tools/releasetools/ota_from_target_files
		@echo "Package OTA: $@"
		$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \
		./build/tools/releasetools/ota_from_target_files -v \
		build/make/tools/releasetools/ota_from_target_files -v \
		--block \
		--extracted_input_target_files $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE)) \
		-p $(HOST_OUT) \

core/config.mk

+8 −8

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ SRC_SYSTEM_API_DIR := $(TOPDIR)prebuilts/sdk/system-api
		SRC_TEST_API_DIR := $(TOPDIR)prebuilts/sdk/test-api

		# Some specific paths to tools
		SRC_DROIDDOC_DIR := $(TOPDIR)build/tools/droiddoc
		SRC_DROIDDOC_DIR := $(TOPDIR)build/make/tools/droiddoc

		# Set up efficient math functions which are used in make.
		# Here since this file is included by envsetup as well as during build.
		@@ -167,7 +167,7 @@ hide := @
		################################################################
		# Tools needed in product configuration makefiles.
		################################################################
		NORMALIZE_PATH := build/tools/normalize_path.py
		NORMALIZE_PATH := build/make/tools/normalize_path.py

		# $(1): the paths to be normalized
		define normalize-paths
		@@ -657,17 +657,17 @@ MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh
		SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)
		IMG2SIMG := $(HOST_OUT_EXECUTABLES)/img2simg$(HOST_EXECUTABLE_SUFFIX)
		E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)
		MKTARBALL := build/tools/mktarball.sh
		MKTARBALL := build/make/tools/mktarball.sh
		TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)
		JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar
		DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar
		FAT16COPY := build/tools/fat16copy.py
		CHECK_LINK_TYPE := build/tools/check_link_type.py
		FAT16COPY := build/make/tools/fat16copy.py
		CHECK_LINK_TYPE := build/make/tools/check_link_type.py

		PROGUARD := external/proguard/bin/proguard.sh
		JAVATAGS := build/tools/java-event-log-tags.py
		MERGETAGS := build/tools/merge-event-log-tags.py
		BUILD_IMAGE_SRCS := $(wildcard build/tools/releasetools/*.py)
		JAVATAGS := build/make/tools/java-event-log-tags.py
		MERGETAGS := build/make/tools/merge-event-log-tags.py
		BUILD_IMAGE_SRCS := $(wildcard build/make/tools/releasetools/*.py)
		APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg
		VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer
		BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree

core/definitions.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ endef
		# $(1): directory to search under
		# Ignores $(1)/Android.mk
		define first-makefiles-under
		$(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) \
		$(shell build/make/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) \
		--mindepth=2 $(addprefix --dir=,$(1)) Android.mk)
		endef

		@@ -2253,7 +2253,7 @@ $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \
		\@$(PRIVATE_JAVA_SOURCE_LIST) \
		\|\| ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) \
		fi
		$(if $(PRIVATE_JAVA_LAYERS_FILE), $(hide) build/tools/java-layers.py \
		$(if $(PRIVATE_JAVA_LAYERS_FILE), $(hide) build/make/tools/java-layers.py \
		$(PRIVATE_JAVA_LAYERS_FILE) @$(PRIVATE_JAVA_SOURCE_LIST),)
		$(if $(PRIVATE_JAR_EXCLUDE_FILES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DIR) \
		-name $(word 1, $(PRIVATE_JAR_EXCLUDE_FILES)) \

core/generate_enforce_rro.mk

+4 −4

Original line number	Diff line number	Diff line
		@@ -7,12 +7,12 @@ rro_android_manifest_file := $(intermediates)/AndroidManifest.xml

		ifeq (true,$(enforce_rro_source_is_manifest_package_name))
		$(rro_android_manifest_file): PRIVATE_PACKAGE_NAME := $(enforce_rro_source_manifest_package_info)
		$(rro_android_manifest_file): build/tools/generate-enforce-rro-android-manifest.py
		$(hide) build/tools/generate-enforce-rro-android-manifest.py -u -p $(PRIVATE_PACKAGE_NAME) -o $@
		$(rro_android_manifest_file): build/make/tools/generate-enforce-rro-android-manifest.py
		$(hide) build/make/tools/generate-enforce-rro-android-manifest.py -u -p $(PRIVATE_PACKAGE_NAME) -o $@
		else
		$(rro_android_manifest_file): PRIVATE_SOURCE_MANIFEST_FILE := $(enforce_rro_source_manifest_package_info)
		$(rro_android_manifest_file): $(enforce_rro_source_manifest_package_info) build/tools/generate-enforce-rro-android-manifest.py
		$(hide) build/tools/generate-enforce-rro-android-manifest.py -p $(PRIVATE_SOURCE_MANIFEST_FILE) -o $@
		$(rro_android_manifest_file): $(enforce_rro_source_manifest_package_info) build/make/tools/generate-enforce-rro-android-manifest.py
		$(hide) build/make/tools/generate-enforce-rro-android-manifest.py -p $(PRIVATE_SOURCE_MANIFEST_FILE) -o $@
		endif

		LOCAL_PATH:= $(intermediates)

core/host_java_library.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ all_java_sources := $(java_sources)
		include $(BUILD_SYSTEM)/java_common.mk

		# The layers file allows you to enforce a layering between java packages.
		# Run build/tools/java-layers.py for more details.
		# Run build/make/tools/java-layers.py for more details.
		layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))

		# If error prone is enabled then add LOCAL_ERROR_PRONE_FLAGS to LOCAL_JAVACFLAGS