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

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

Merge "Move checkbuild targets of Soong modules into Soong" into main am: d41d4149 

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



Change-Id: I2940228144e026f91f2ef7dc8f4a2355450997b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27327f55 d41d4149

core/soong_android_app_set.mk

+0 −4
Original line number Diff line number Diff line
@@ -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

#######################################

core/soong_app_prebuilt.mk

+0 −10
Original line number Diff line number Diff line
@@ -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

#######################################

core/soong_cc_rust_prebuilt.mk

+1 −5
Original line number Diff line number Diff line
@@ -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



#######################################

core/soong_java_prebuilt.mk

+0 −13
Original line number Diff line number Diff line
@@ -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

#######################################