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

Commit 40098dca authored by Jason Tholstrup's avatar Jason Tholstrup Committed by Colin Cross
Browse files

Updated static_java_library.mk to support proguard options. 

For reference we are trying to build an AAR and want to filter out anything private and anything marked @hide.

Test: built dist and verified package contents.

Change-Id: I2b9847501d677f56d3918ac0694e6e1f6cda32c8
Merged-In: I2b9847501d677f56d3918ac0694e6e1f6cda32c8
(cherry picked from commit 37926ded)
parent 24678e94

core/static_java_library.mk

+12 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ endif 


proguard_options_file :=



ifneq ($(LOCAL_PROGUARD_ENABLED),custom)

ifneq ($(filter custom,$(LOCAL_PROGUARD_ENABLED)),custom)

  proguard_options_file := $(intermediates.COMMON)/proguard_options

endif
@@ -184,14 +184,22 @@ $(jack_check_timestamp): $(R_file_stamp) 
endif # LOCAL_JACK_ENABLED

$(full_classes_compiled_jar): $(R_file_stamp)





# if we have custom proguarding done use the proguarded classes jar instead of the normal classes jar

ifeq ($(filter custom,$(LOCAL_PROGUARD_ENABLED)),custom)

aar_classes_jar = $(full_classes_proguard_jar)

else

aar_classes_jar = $(full_classes_jar)

endif



# Rule to build AAR, archive including classes.jar, resource, etc.

built_aar := $(intermediates.COMMON)/javalib.aar

$(built_aar): PRIVATE_MODULE := $(LOCAL_MODULE)

$(built_aar): PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)

$(built_aar): PRIVATE_CLASSES_JAR := $(full_classes_jar)

$(built_aar): PRIVATE_CLASSES_JAR := $(aar_classes_jar)

$(built_aar): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)

$(built_aar): PRIVATE_R_TXT := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/R.txt

$(built_aar) : $(full_classes_jar) $(full_android_manifest)

$(built_aar) : $(aar_classes_jar) $(full_android_manifest)

	@echo "target AAR:  $(PRIVATE_MODULE) ($@)"

	$(hide) rm -rf $(dir $@)aar && mkdir -p $(dir $@)aar/res

	$(hide) cp $(PRIVATE_ANDROID_MANIFEST) $(dir $@)aar/AndroidManifest.xml
@@ -207,5 +215,6 @@ ALL_MODULES.$(LOCAL_MODULE).AAR := $(built_aar) 
endif  # need_compile_res



# Reset internal variables.

aar_classes_jar :=

all_res_assets :=

LOCAL_IS_STATIC_JAVA_LIBRARY :=