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

Commit 26be7f3f authored Oct 11, 2021 by Colin Cross Committed by Automerger Merge Worker Oct 11, 2021

Merge "Use the Soong output as the checkbuild target" am: 54686043 am:...

Merge "Use the Soong output as the checkbuild target" am: 54686043 am: b808b63b am: e8857148 am: 14bce711 am: 5b1a4b4c

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

Change-Id: I139790d0fd75229cfac3f9631a1594a50fd243ba

parents b779801a 5b1a4b4c

core/soong_android_app_set.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,11 @@ endif
		LOCAL_BUILT_MODULE_STEM := $(LOCAL_APK_SET_INSTALL_FILE)
		LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_APK_SET_INSTALL_FILE)


		# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE
		# to avoid checkbuilds making an extra copy of every module.
		LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE)

		#######################################
		include $(BUILD_SYSTEM)/base_rules.mk
		#######################################

core/soong_app_prebuilt.mk

+11 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,17 @@ full_classes_jar := $(intermediates.COMMON)/classes.jar
		full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar
		full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar


		# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE
		# to avoid checkbuilds making an extra copy of every module.
		LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_CLASSES_JAR)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_HEADER_JAR)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_FULL_MANIFEST_FILE)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_DEXPREOPT_CONFIG)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_DEX_JAR)

		#######################################
		include $(BUILD_SYSTEM)/base_rules.mk
		#######################################

core/soong_cc_prebuilt.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,11 @@ ifeq ($(TARGET_SKIP_CURRENT_VNDK),true)
		endif
		endif


		# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE
		# to avoid checkbuilds making an extra copy of every module.
		LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE)

		#######################################
		include $(BUILD_SYSTEM)/base_rules.mk
		#######################################

core/soong_java_prebuilt.mk

+9 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,15 @@ ifdef LOCAL_SOONG_AAR
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_AAR)
		endif

		# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE
		# to avoid checkbuilds making an extra copy of every module.
		LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_HEADER_JAR)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_FULL_MANIFEST_FILE)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_DEXPREOPT_CONFIG)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE)
		LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_DEX_JAR)

		#######################################
		include $(BUILD_SYSTEM)/base_rules.mk
		#######################################

core/soong_rust_prebuilt.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,9 @@ ifndef LOCAL_UNINSTALLABLE_MODULE
		endif
		endif

		# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE
		# to avoid checkbuilds making an extra copy of every module.
		LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE)

		#######################################
		include $(BUILD_SYSTEM)/base_rules.mk