Merge "Use the Soong output as the checkbuild target"
This commit is contained in:
@@ -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
|
||||
#######################################
|
||||
|
@@ -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
|
||||
#######################################
|
||||
|
@@ -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
|
||||
#######################################
|
||||
|
@@ -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
|
||||
#######################################
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user