diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2016-04-29 17:55:51 +0200 |
|---|---|---|
| committer | Jorge Ruesga <jorge@ruesga.com> | 2016-04-29 17:55:51 +0200 |
| commit | 1efc554af5a47172f98c729baaeb338d69536fcd (patch) | |
| tree | 807acf3c4c62e85c181c43632326f0f2a96838be | |
| parent | 7e2ab69d70bcddab403a3757421181594cc00656 (diff) | |
| download | build-1efc554af5a47172f98c729baaeb338d69536fcd.zip build-1efc554af5a47172f98c729baaeb338d69536fcd.tar.gz build-1efc554af5a47172f98c729baaeb338d69536fcd.tar.bz2 | |
build: allow to set a consumer proguard file
This allow to specify a proguard file by defining LOCAL_CONSUMER_PROGUARD_FILE
that will inserted in the root directory of the aar and to be consumed by another apk
via gradle plugin
Change-Id: Ia3c11e5ea8e694800fb262b835432f86a6777f86
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
| -rw-r--r-- | core/static_java_library.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/static_java_library.mk b/core/static_java_library.mk index 764ab89..f4da963 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -140,6 +140,7 @@ $(built_aar): PRIVATE_ANDROID_MANIFEST := $(full_android_manifest) $(built_aar): PRIVATE_CLASSES_JAR := $(LOCAL_BUILT_MODULE) $(built_aar): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR) $(built_aar): PRIVATE_R_TXT := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/R.txt +$(built_aar): PRIVATE_CONSUMER_PROGUARD_FILE := $(LOCAL_CONSUMER_PROGUARD_FILE) $(built_aar) : $(LOCAL_BUILT_MODULE) @echo "target AAR: $(PRIVATE_MODULE) ($@)" $(hide) rm -rf $(dir $@)aar && mkdir -p $(dir $@)aar/res @@ -148,6 +149,9 @@ $(built_aar) : $(LOCAL_BUILT_MODULE) # Note: Use "cp -n" to honor the resource overlay rules, if multiple res dirs exist. $(hide) $(foreach res,$(PRIVATE_RESOURCE_DIR),cp -Rfn $(res)/* $(dir $@)aar/res;) $(hide) cp $(PRIVATE_R_TXT) $(dir $@)aar/R.txt +ifneq ($(PRIVATE_CONSUMER_PROGUARD_FILE),) + $(hide) cp $(PRIVATE_CONSUMER_PROGUARD_FILE) $(dir $@)aar/proguard.txt +endif $(hide) jar -cMf $@ \ -C $(dir $@)aar . |