From 0162cc8beadf34c956d9830a213ff5434913351c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 29 Jan 2019 15:04:39 -0800 Subject: [PATCH 1/2] Add LOCAL_ADDITIONAL_CHECKED_MODULE Adding an intermediate file to LOCAL_ADDITIONAL_CHECKED_MODULE will cause the file to be built for m , mma, or m checkbuild. Test: m checkbuild Change-Id: I2b7c3c8f01960ce2f9176c8a2108f759fd8fc704 --- core/base_rules.mk | 4 +++- core/clear_vars.mk | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/base_rules.mk b/core/base_rules.mk index 64e1069b5..fd369f2fa 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -389,7 +389,7 @@ $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MODULE:= $(my_register_name) # We name both BUILT and INSTALLED in case # LOCAL_UNINSTALLABLE_MODULE is set. .PHONY: $(my_all_targets) -$(my_all_targets): $(LOCAL_BUILT_MODULE) $(LOCAL_INSTALLED_MODULE) +$(my_all_targets): $(LOCAL_BUILT_MODULE) $(LOCAL_INSTALLED_MODULE) $(LOCAL_ADDITIONAL_CHECKED_MODULE) .PHONY: $(my_register_name) $(my_register_name): $(my_all_targets) @@ -485,6 +485,8 @@ else my_checked_module := $(LOCAL_BUILT_MODULE) endif +my_checked_module += $(LOCAL_ADDITIONAL_CHECKED_MODULE) + # If they request that this module not be checked, then don't. # PLEASE DON'T SET THIS. ANY PLACES THAT SET THIS WITHOUT # GOOD REASON WILL HAVE IT REMOVED. diff --git a/core/clear_vars.mk b/core/clear_vars.mk index e19091633..3b207e0c2 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -10,6 +10,7 @@ LOCAL_AAPT_FLAGS:= LOCAL_AAPT_INCLUDE_ALL_RESOURCES:= LOCAL_AAPT_NAMESPACES:= LOCAL_ADDITIONAL_CERTIFICATES:= +LOCAL_ADDITIONAL_CHECKED_MODULE:= LOCAL_ADDITIONAL_DEPENDENCIES:= LOCAL_ADDITIONAL_HTML_DIR:= LOCAL_ADDITIONAL_JAVA_DIR:= From bd2287b8464370de49385e81e53849f37894ef84 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 29 Jan 2019 15:07:46 -0800 Subject: [PATCH 2/2] Build aar files for m Test: m SystemUI-core Change-Id: I0bee792d1af80abb3e74c278db488bd668bd1fb4 --- core/soong_app_prebuilt.mk | 8 +++++--- core/soong_java_prebuilt.mk | 12 +++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index a6315b40d..796a85cc2 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -19,14 +19,16 @@ endif LOCAL_MODULE_SUFFIX := .apk LOCAL_BUILT_MODULE_STEM := package.apk -####################################### -include $(BUILD_SYSTEM)/base_rules.mk -####################################### +intermediates.COMMON := $(call local-intermediates-dir,COMMON) 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 +####################################### +include $(BUILD_SYSTEM)/base_rules.mk +####################################### + ifdef LOCAL_SOONG_CLASSES_JAR $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar))) $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar))) diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index 66410e155..08d545d94 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -13,9 +13,7 @@ endif LOCAL_MODULE_SUFFIX := .jar LOCAL_BUILT_MODULE_STEM := javalib.jar -####################################### -include $(BUILD_SYSTEM)/base_rules.mk -####################################### +intermediates.COMMON := $(call local-intermediates-dir,COMMON) full_classes_jar := $(intermediates.COMMON)/classes.jar full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar @@ -24,6 +22,14 @@ common_javalib.jar := $(intermediates.COMMON)/javalib.jar hiddenapi_flags_csv := $(intermediates.COMMON)/hiddenapi/flags.csv hiddenapi_metadata_csv := $(intermediates.COMMON)/hiddenapi/greylist.csv +ifdef LOCAL_SOONG_AAR + LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_AAR) +endif + +####################################### +include $(BUILD_SYSTEM)/base_rules.mk +####################################### + ifdef LOCAL_SOONG_CLASSES_JAR $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar))) $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))