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

Commit 9ee26d3e authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Stop using the `files` target for droidcore" am: 7c7252d6 am: 2088fbba 

am: c45a06de

Change-Id: I30cb945f01b30bc77a48e7ef0b99884b8006f157
parents db65cb56 c45a06de

core/main.mk

+3 −2
Original line number Diff line number Diff line
@@ -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.

core/tasks/module-info.mk

+1 −1
Original line number Diff line number Diff line
@@ -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))