Merge "Shift the preprocess mk before build emulator packages" into main (95661308) · Commits · e / os / android_build

core/Makefile

+4 −1

Original line number	Diff line number	Diff line
		@@ -7562,6 +7562,10 @@ systemimage: $(QEMU_VERIFIED_BOOT_PARAMS)
		droidcore-unbundled: $(QEMU_VERIFIED_BOOT_PARAMS)

		endif

		# Preprocess files for emulator and sdk.
		-include development/build/tools/sdk-preprocess-files.mk

		# -----------------------------------------------------------------
		# The emulator package
		ifeq ($(BUILD_EMULATOR),true)
		@@ -7606,7 +7610,6 @@ sdk_name := $(sdk_name)_$(INTERNAL_SDK_HOST_OS_NAME)
		sdk_dep_file := $(sdk_dir)/sdk_deps.mk

		ATREE_FILES :=
		include development/build/tools/sdk-preprocess-files.mk
		-include $(sdk_dep_file)

		# if we don't have a real list, then use "everything"