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

Commit bd2287b8 authored by Colin Cross's avatar Colin Cross
Browse files

Build aar files for m <module name> 

Test: m SystemUI-core
Change-Id: I0bee792d1af80abb3e74c278db488bd668bd1fb4
parent 0162cc8b

core/soong_app_prebuilt.mk

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

core/soong_java_prebuilt.mk

+9 −3
Original line number Diff line number Diff line
@@ -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)))