aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen2019-01-15 13:11:01 -0600
committerGerrit Code Review2019-01-15 13:11:01 -0600
commit7c7252d62841706d1357290e48c6ec17f01e0093 (patch)
treed1658456d0946a1e905568c692fc98920d4e341c
parent5a8953757430cacbf0a7b194f3861fb24e175636 (diff)
parent3b6f6fe8aad172b8a2dd5bb5bcf9b8b6adc0a72d (diff)
downloadplatform-build-7c7252d62841706d1357290e48c6ec17f01e0093.tar.gz
platform-build-7c7252d62841706d1357290e48c6ec17f01e0093.tar.xz
platform-build-7c7252d62841706d1357290e48c6ec17f01e0093.zip
Merge "Stop using the `files` target for droidcore"
-rw-r--r--core/main.mk5
-rw-r--r--core/tasks/module-info.mk2
2 files changed, 4 insertions, 3 deletions
diff --git a/core/main.mk b/core/main.mk
index 282821cdb..c84cbe067 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1305,8 +1305,8 @@ auxiliary: $(INSTALLED_AUX_TARGETS)
1305 1305
1306# Build files and then package it into the rom formats 1306# Build files and then package it into the rom formats
1307.PHONY: droidcore 1307.PHONY: droidcore
1308droidcore: files \ 1308droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \
1309 systemimage \ 1309 $(INSTALLED_SYSTEMIMAGE_TARGET) \
1310 $(INSTALLED_RAMDISK_TARGET) \ 1310 $(INSTALLED_RAMDISK_TARGET) \
1311 $(INSTALLED_BOOTIMAGE_TARGET) \ 1311 $(INSTALLED_BOOTIMAGE_TARGET) \
1312 $(INSTALLED_RECOVERYIMAGE_TARGET) \ 1312 $(INSTALLED_RECOVERYIMAGE_TARGET) \
@@ -1337,6 +1337,7 @@ droidcore: files \
1337 $(INSTALLED_FILES_JSON_ROOT) \ 1337 $(INSTALLED_FILES_JSON_ROOT) \
1338 $(INSTALLED_FILES_FILE_RECOVERY) \ 1338 $(INSTALLED_FILES_FILE_RECOVERY) \
1339 $(INSTALLED_FILES_JSON_RECOVERY) \ 1339 $(INSTALLED_FILES_JSON_RECOVERY) \
1340 $(INSTALLED_ANDROID_INFO_TXT_TARGET) \
1340 soong_docs 1341 soong_docs
1341 1342
1342# dist_files only for putting your library into the dist directory with a full build. 1343# dist_files only for putting your library into the dist directory with a full build.
diff --git a/core/tasks/module-info.mk b/core/tasks/module-info.mk
index 9eb3ab329..2c56162d5 100644
--- a/core/tasks/module-info.mk
+++ b/core/tasks/module-info.mk
@@ -25,7 +25,7 @@ $(MODULE_INFO_JSON):
25# If ONE_SHOT_MAKEFILE is set, our view of the world is smaller, so don't 25# If ONE_SHOT_MAKEFILE is set, our view of the world is smaller, so don't
26# rewrite the file in that came. 26# rewrite the file in that came.
27ifndef ONE_SHOT_MAKEFILE 27ifndef ONE_SHOT_MAKEFILE
28files: $(MODULE_INFO_JSON) 28droidcore: $(MODULE_INFO_JSON)
29endif 29endif
30 30
31$(call dist-for-goals, general-tests, $(MODULE_INFO_JSON)) 31$(call dist-for-goals, general-tests, $(MODULE_INFO_JSON))