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

Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" am: 08472a6b4b

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

Change-Id: I0b3e806c6ef03de8e8fa5ae4120d3194f9f8b1f9
This commit is contained in:
Bob Badour
2021-09-10 17:22:16 +00:00
committed by Automerger Merge Worker
parent 5353d0f3b9 08472a6b4b
commit 98fd5d25d7
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/host_java_library.mk
View File

@@ -131,3 +131,8 @@ $(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_jar)
ifeq ($(TURBINE_ENABLED),false) ifeq ($(TURBINE_ENABLED),false)
$(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_header_jar))) $(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_header_jar)))
endif endif
#######################################
# Capture deps added after base_rules.mk
include $(BUILD_NOTICE_FILE)
#######################################

5
core/soong_app_prebuilt.mk
View File

@@ -254,3 +254,8 @@ ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE
endif endif
SOONG_ALREADY_CONV += $(LOCAL_MODULE) SOONG_ALREADY_CONV += $(LOCAL_MODULE)
#######################################
# Capture deps added after base_rules.mk
include $(BUILD_NOTICE_FILE)
#######################################

5
core/soong_java_prebuilt.mk
View File

@@ -206,3 +206,8 @@ $(my_exported_sdk_libs_file):
$(hide) touch $@) $(hide) touch $@)
SOONG_ALREADY_CONV += $(LOCAL_MODULE) SOONG_ALREADY_CONV += $(LOCAL_MODULE)
#######################################
# Capture deps added after base_rules.mk
include $(BUILD_NOTICE_FILE)
#######################################