Merge "Remove duplicate includes of BUILD_NOTICE_FILE" am: 3db143c452
am: 0238985e0f
Original change: https://android-review.googlesource.com/c/platform/build/+/1906235 Change-Id: I9c635cc792d8df3d3b1721200a9f0dadf6689002
This commit is contained in:
@@ -131,8 +131,3 @@ $(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_jar)
|
||||
ifeq ($(TURBINE_ENABLED),false)
|
||||
$(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_header_jar)))
|
||||
endif
|
||||
|
||||
#######################################
|
||||
# Capture deps added after base_rules.mk
|
||||
include $(BUILD_NOTICE_FILE)
|
||||
#######################################
|
||||
|
@@ -258,8 +258,3 @@ ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE
|
||||
endif
|
||||
|
||||
SOONG_ALREADY_CONV += $(LOCAL_MODULE)
|
||||
|
||||
#######################################
|
||||
# Capture deps added after base_rules.mk
|
||||
include $(BUILD_NOTICE_FILE)
|
||||
#######################################
|
||||
|
@@ -209,8 +209,3 @@ $(my_exported_sdk_libs_file):
|
||||
$(hide) touch $@)
|
||||
|
||||
SOONG_ALREADY_CONV += $(LOCAL_MODULE)
|
||||
|
||||
#######################################
|
||||
# Capture deps added after base_rules.mk
|
||||
include $(BUILD_NOTICE_FILE)
|
||||
#######################################
|
||||
|
Reference in New Issue
Block a user