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

Commit 9b5cb6a6 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Remove duplicate includes of BUILD_NOTICE_FILE" am: 3db143c4 am: 0238985e

Original change: https://android-review.googlesource.com/c/platform/build/+/1906235

Change-Id: I9c635cc792d8df3d3b1721200a9f0dadf6689002
parents a8c667a4 0238985e
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -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)
#######################################
+0 −5
Original line number Diff line number Diff line
@@ -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)
#######################################
+0 −5
Original line number Diff line number Diff line
@@ -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)
#######################################