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

Commit 1d646231 authored by Dan Willemsen's avatar Dan Willemsen Committed by Colin Cross
Browse files

Export proguard flags from static android libraries and aar prebuilts 

Test: m Contacts, classes-proguard.jar has same contents
Test: rm -rf out; tapas Contacts; m
Change-Id: Id7a92fb2c44913bccbfcbeae127355b4de588e4d
Merged-In: Id7a92fb2c44913bccbfcbeae127355b4de588e4d
(cherry picked from commit 1417c177)
parent 5b82359f

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ LOCAL_EXPORT_C_INCLUDE_DEPS:= 
LOCAL_EXPORT_C_INCLUDE_DIRS:=

LOCAL_EXPORT_HEADER_LIBRARY_HEADERS:=

LOCAL_EXPORT_PACKAGE_RESOURCES:=

LOCAL_EXPORT_PROGUARD_FLAG_FILES:=

LOCAL_EXPORT_SHARED_LIBRARY_HEADERS:=

LOCAL_EXPORT_STATIC_LIBRARY_HEADERS:=

LOCAL_EXTRACT_APK:=

core/java.mk

+6 −0
Original line number Diff line number Diff line
@@ -644,6 +644,12 @@ ifeq ($(filter shrinktests,$(LOCAL_PROGUARD_ENABLED)),) 
common_proguard_flags += -dontshrink # don't shrink tests by default

endif # shrinktests

endif # test package

ifneq ($(LOCAL_PROGUARD_ENABLED),custom)

  ifdef LOCAL_USE_AAPT2

    common_proguard_flag_files += $(foreach l,$(LOCAL_STATIC_ANDROID_LIBRARIES),\

        $(call intermediates-dir-for,JAVA_LIBRARIES,$(l),,COMMON)/export_proguard_flags)

  endif

endif

ifneq ($(common_proguard_flag_files),)

common_proguard_flags += $(addprefix -include , $(common_proguard_flag_files))

# This is included from $(BUILD_SYSTEM)/proguard.flags

core/prebuilt_internal.mk

+8 −0
Original line number Diff line number Diff line
@@ -566,12 +566,16 @@ my_src_aar := $(filter %.aar, $(my_prebuilt_src_file)) 
ifneq ($(my_src_aar),)

# This is .aar file, archive of classes.jar and Android resources.

my_src_jar := $(intermediates.COMMON)/aar/classes.jar

my_src_proguard_options := $(intermediates.COMMON)/aar/proguard.txt



$(my_src_jar) : .KATI_IMPLICIT_OUTPUTS := $(my_src_proguard_options)

$(my_src_jar) : $(my_src_aar)

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

	$(hide) unzip -qo -d $(dir $@) $<

	# Make sure the extracted classes.jar has a new timestamp.

	$(hide) touch $@

	# Make sure the proguard file exists and has a new timestamp.

	$(hide) touch $(dir $@)/proguard.txt



endif
@@ -595,6 +599,10 @@ endif 


ifdef LOCAL_USE_AAPT2

ifneq ($(my_src_aar),)



$(intermediates.COMMON)/export_proguard_flags : $(my_src_proguard_options)

	$(transform-prebuilt-to-target)



LOCAL_SDK_RES_VERSION:=$(strip $(LOCAL_SDK_RES_VERSION))

ifeq ($(LOCAL_SDK_RES_VERSION),)

  LOCAL_SDK_RES_VERSION:=$(LOCAL_SDK_VERSION)

core/static_java_library.mk

+7 −0
Original line number Diff line number Diff line
@@ -118,6 +118,13 @@ framework_res_package_export_deps := \ 
endif

endif



ifdef LOCAL_USE_AAPT2

$(intermediates.COMMON)/export_proguard_flags: $(addprefix $(LOCAL_PATH)/,$(LOCAL_EXPORT_PROGUARD_FLAG_FILES))

	@echo "Export proguard flags: $@"

	rm -f $@

	cat $+ >$@

endif



# add --non-constant-id to prevent inlining constants.

# AAR needs text symbol file R.txt.

ifdef LOCAL_USE_AAPT2