p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Stop using the `files` target for droidcore" am: 7c7252d628 am: 2088fbbabb 

am: c45a06de0c

Change-Id: I30cb945f01b30bc77a48e7ef0b99884b8006f157
This commit is contained in:
Dan Willemsen 2019-01-15 12:07:49 -08:00 committed by android-build-merger
parent db65cb56e8 c45a06de0c
commit 9ee26d3e2d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/main.mk
View File

@ -1305,8 +1305,8 @@ auxiliary: $(INSTALLED_AUX_TARGETS)
# Build files and then package it into the rom formats
.PHONY: droidcore
droidcore: files \
systemimage \
droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \
$(INSTALLED_SYSTEMIMAGE_TARGET) \
$(INSTALLED_RAMDISK_TARGET) \
$(INSTALLED_BOOTIMAGE_TARGET) \
$(INSTALLED_RECOVERYIMAGE_TARGET) \
@ -1337,6 +1337,7 @@ droidcore: files \
$(INSTALLED_FILES_JSON_ROOT) \
$(INSTALLED_FILES_FILE_RECOVERY) \
$(INSTALLED_FILES_JSON_RECOVERY) \
$(INSTALLED_ANDROID_INFO_TXT_TARGET) \
soong_docs
# dist_files only for putting your library into the dist directory with a full build.

2
core/tasks/module-info.mk
View File

@ -25,7 +25,7 @@ $(MODULE_INFO_JSON):
# If ONE_SHOT_MAKEFILE is set, our view of the world is smaller, so don't
# rewrite the file in that came.
ifndef ONE_SHOT_MAKEFILE
files: $(MODULE_INFO_JSON)
droidcore: $(MODULE_INFO_JSON)
endif
$(call dist-for-goals, general-tests, $(MODULE_INFO_JSON))