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

Merge "Stop using the files target for droidcore"

Browse Source
This commit is contained in:
Dan Willemsen
2019-01-15 19:11:01 +00:00
committed by Gerrit Code Review
parent 5a89537574 3b6f6fe8aa
commit 7c7252d628
2 changed files with 4 additions and 3 deletions
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 # Build files and then package it into the rom formats
.PHONY: droidcore .PHONY: droidcore
droidcore: files \ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \
systemimage \ $(INSTALLED_SYSTEMIMAGE_TARGET) \
$(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \
$(INSTALLED_BOOTIMAGE_TARGET) \ $(INSTALLED_BOOTIMAGE_TARGET) \
$(INSTALLED_RECOVERYIMAGE_TARGET) \ $(INSTALLED_RECOVERYIMAGE_TARGET) \
@@ -1337,6 +1337,7 @@ droidcore: files \
$(INSTALLED_FILES_JSON_ROOT) \ $(INSTALLED_FILES_JSON_ROOT) \
$(INSTALLED_FILES_FILE_RECOVERY) \ $(INSTALLED_FILES_FILE_RECOVERY) \
$(INSTALLED_FILES_JSON_RECOVERY) \ $(INSTALLED_FILES_JSON_RECOVERY) \
$(INSTALLED_ANDROID_INFO_TXT_TARGET) \
soong_docs soong_docs
# dist_files only for putting your library into the dist directory with a full build. # 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 # If ONE_SHOT_MAKEFILE is set, our view of the world is smaller, so don't
# rewrite the file in that came. # rewrite the file in that came.
ifndef ONE_SHOT_MAKEFILE ifndef ONE_SHOT_MAKEFILE
files: $(MODULE_INFO_JSON) droidcore: $(MODULE_INFO_JSON)
endif endif
$(call dist-for-goals, general-tests, $(MODULE_INFO_JSON)) $(call dist-for-goals, general-tests, $(MODULE_INFO_JSON))