diff --git a/core/Makefile b/core/Makefile index de73a05f60..00952714e6 100644 --- a/core/Makefile +++ b/core/Makefile @@ -779,7 +779,6 @@ endif # ----------------------------------------------------------------- # the root dir INTERNAL_ROOT_FILES := $(filter $(TARGET_ROOT_OUT)/%, \ - $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES)) INSTALLED_FILES_FILE_ROOT := $(PRODUCT_OUT)/installed-files-root.txt @@ -813,7 +812,6 @@ endif # the ramdisk ifdef BUILDING_RAMDISK_IMAGE INTERNAL_RAMDISK_FILES := $(filter $(TARGET_RAMDISK_OUT)/%, \ - $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES)) INSTALLED_FILES_FILE_RAMDISK := $(PRODUCT_OUT)/installed-files-ramdisk.txt @@ -1247,7 +1245,6 @@ ifeq ($(PRODUCT_SUPPORTS_VERITY),true) endif INTERNAL_VENDOR_RAMDISK_FILES := $(filter $(TARGET_VENDOR_RAMDISK_OUT)/%, \ - $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES)) INTERNAL_VENDOR_RAMDISK_TARGET := $(call intermediates-dir-for,PACKAGING,vendor_boot)/vendor_ramdisk.cpio$(RAMDISK_EXT) @@ -2451,7 +2448,6 @@ endif ifneq ($(BUILDING_DEBUG_BOOT_IMAGE)$(BUILDING_DEBUG_VENDOR_BOOT_IMAGE),) INTERNAL_DEBUG_RAMDISK_FILES := $(filter $(TARGET_DEBUG_RAMDISK_OUT)/%, \ - $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES)) # Directories to be picked into the debug ramdisk. @@ -2589,7 +2585,6 @@ endif # BUILDING_DEBUG_BOOT_IMAGE ifdef BUILDING_DEBUG_VENDOR_BOOT_IMAGE INTERNAL_VENDOR_DEBUG_RAMDISK_FILES := $(filter $(TARGET_VENDOR_DEBUG_RAMDISK_OUT)/%, \ - $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES)) # The debug vendor ramdisk combines vendor ramdisk and debug ramdisk. @@ -2700,7 +2695,6 @@ $(call declare-1p-target,$(INTERNAL_TEST_HARNESS_RAMDISK_ADB_DEBUG_PROP_TARGET)) INTERNAL_TEST_HARNESS_RAMDISK_FILES := $(filter $(TARGET_TEST_HARNESS_RAMDISK_OUT)/%, \ $(INTERNAL_TEST_HARNESS_RAMDISK_ADB_DEBUG_PROP_TARGET) \ - $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES)) # The order is important here. The test harness ramdisk staging directory has to @@ -2875,7 +2869,7 @@ fsverity-metadata-targets := $(sort $(filter \ $(TARGET_OUT)/etc/boot-image.prof \ $(TARGET_OUT)/etc/dirty-image-objects \ $(TARGET_OUT)/etc/classpaths/%.pb, \ - $(ALL_GENERATED_SOURCES) $(ALL_DEFAULT_INSTALLED_MODULES))) + $(ALL_DEFAULT_INSTALLED_MODULES))) define fsverity-generate-metadata $(1).fsv_meta: PRIVATE_SRC := $(1) @@ -2922,7 +2916,6 @@ ALL_DEFAULT_INSTALLED_MODULES += $(FSVERITY_APK_OUT) endif # PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA INTERNAL_SYSTEMIMAGE_FILES := $(sort $(filter $(TARGET_OUT)/%, \ - $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES))) # Create symlink /system/vendor to /vendor if necessary. diff --git a/core/binary.mk b/core/binary.mk index 94e3a0fecb..665270e30a 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -573,8 +573,6 @@ my_generated_sources := $(patsubst $(generated_sources_dir)/%,$(intermediates)/% # the dependencies. my_gen_src_files := $(filter %.c %$(LOCAL_CPP_EXTENSION) %.S %.s,$(my_generated_sources)) -ALL_GENERATED_SOURCES += $(my_generated_sources) - #################################################### ## Compile RenderScript with reflected C++ #################################################### diff --git a/core/config.mk b/core/config.mk index 5ef9211846..12bb9aad52 100644 --- a/core/config.mk +++ b/core/config.mk @@ -159,6 +159,7 @@ $(KATI_deprecated_var BOARD_PLAT_PUBLIC_SEPOLICY_DIR,Use SYSTEM_EXT_PUBLIC_SEPOL $(KATI_deprecated_var BOARD_PLAT_PRIVATE_SEPOLICY_DIR,Use SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS instead) $(KATI_obsolete_var TARGET_NO_VENDOR_BOOT,Use PRODUCT_BUILD_VENDOR_BOOT_IMAGE instead) $(KATI_obsolete_var PRODUCT_CHECK_ELF_FILES,Use BUILD_BROKEN_PREBUILT_ELF_FILES instead) +$(KATI_obsolete_var ALL_GENERATED_SOURCES,ALL_GENERATED_SOURCES is no longer used) # Used to force goals to build. Only use for conditionally defined goals. .PHONY: FORCE diff --git a/core/definitions.mk b/core/definitions.mk index 1c9ebad78b..f4834b6dea 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -59,9 +59,6 @@ ALL_MODULE_TAGS:= # its sub-variables.) ALL_MODULE_NAME_TAGS:= -# Full path to all files that are made by some tool -ALL_GENERATED_SOURCES:= - # Full path to all asm, C, C++, lex and yacc generated C files. # These all have an order-only dependency on the copied headers ALL_C_CPP_ETC_OBJECTS:=