Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03468748 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Shift the preprocess mk before build emulator packages" into main am: 95661308 

Original change: https://android-review.googlesource.com/c/platform/build/+/3128074



Change-Id: Ia51da8f3a3da18ce26af01d6503c2c2dc6491792
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c17b8e9a 95661308

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"