From 988bcf6dc2594dfe0178bbbfb4de0871495fdc1b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 21 Aug 2024 10:45:27 -0700 Subject: [PATCH] Move checkbuild targets of Soong modules into Soong Let Soong specify the files that will be built by checkbuild for each Soong module. This will give better control over which files get built, allowing checkbuild to skip the jar combining step when transitive classpath jars are enabled. Bug: 308016794 Test: m checkbuild Change-Id: Ic5140819381d58f4d00f23a7a12447950c4cf268 --- core/soong_android_app_set.mk | 4 ---- core/soong_app_prebuilt.mk | 10 ---------- core/soong_cc_rust_prebuilt.mk | 6 +----- core/soong_java_prebuilt.mk | 13 ------------- 4 files changed, 1 insertion(+), 32 deletions(-) diff --git a/core/soong_android_app_set.mk b/core/soong_android_app_set.mk index ec3d8c85cb..d97980d2ba 100644 --- a/core/soong_android_app_set.mk +++ b/core/soong_android_app_set.mk @@ -9,10 +9,6 @@ endif LOCAL_BUILT_MODULE_STEM := package.apk LOCAL_INSTALLED_MODULE_STEM := $(notdir $(LOCAL_PREBUILT_MODULE_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 ####################################### diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index 3aa244c77f..df1cf2d369 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -29,16 +29,6 @@ full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.ja 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 ####################################### diff --git a/core/soong_cc_rust_prebuilt.mk b/core/soong_cc_rust_prebuilt.mk index a1c64786ee..da608322f2 100644 --- a/core/soong_cc_rust_prebuilt.mk +++ b/core/soong_cc_rust_prebuilt.mk @@ -38,10 +38,6 @@ 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) - my_check_same_vndk_variants := same_vndk_variants_stamp := ifeq ($(LOCAL_CHECK_SAME_VNDK_VARIANTS),true) @@ -61,7 +57,7 @@ ifeq ($(my_check_same_vndk_variants),true) # Note that because `checkbuild` doesn't check LOCAL_BUILT_MODULE for soong-built modules adding # the timestamp to LOCAL_BUILT_MODULE isn't enough. It is skipped when the vendor variant # isn't used at all and it may break in the downstream trees. - LOCAL_ADDITIONAL_CHECKED_MODULE := $(same_vndk_variants_stamp) + LOCAL_ADDITIONAL_CHECKED_MODULE += $(same_vndk_variants_stamp) endif ####################################### diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index f74bb6d975..8c3882f364 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -21,19 +21,6 @@ full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.ja full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar common_javalib.jar := $(intermediates.COMMON)/javalib.jar -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 #######################################