StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia51da8f3a3da18ce26af01d6503c2c2dc6491792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-06-13 08:36:39 +00:00
committed by Automerger Merge Worker
parent c17b8e9aa6 9566130852
commit 03468748d3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/Makefile
View File

@@ -7562,6 +7562,10 @@ systemimage: $(QEMU_VERIFIED_BOOT_PARAMS)
droidcore-unbundled: $(QEMU_VERIFIED_BOOT_PARAMS) droidcore-unbundled: $(QEMU_VERIFIED_BOOT_PARAMS)
endif endif
# Preprocess files for emulator and sdk.
-include development/build/tools/sdk-preprocess-files.mk
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# The emulator package # The emulator package
ifeq ($(BUILD_EMULATOR),true) 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 sdk_dep_file := $(sdk_dir)/sdk_deps.mk
ATREE_FILES := ATREE_FILES :=
include development/build/tools/sdk-preprocess-files.mk
-include $(sdk_dep_file) -include $(sdk_dep_file)
# if we don't have a real list, then use "everything" # if we don't have a real list, then use "everything"