From 4a9a24481db35e41016c3f73d78a1fe52dbc0d28 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 17 Jan 2019 23:01:45 -0800 Subject: [PATCH] Add PROGUARD_HOME and PROGUARD_DEPS So that we can pass this into MAINDEXCLASSES. Fixes: 122988865 Test: OUT_DIR=$HOME/out mmma frameworks/base/core/tests/hosttests/test-apps Change-Id: I955d3de46d348e3573a6773f69149e7cabab8904 --- core/config.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/config.mk b/core/config.mk index ab9f4c332e..0836142947 100644 --- a/core/config.mk +++ b/core/config.mk @@ -710,7 +710,9 @@ CHECK_LINK_TYPE := build/make/tools/check_link_type.py LPMAKE := $(HOST_OUT_EXECUTABLES)/lpmake$(HOST_EXECUTABLE_SUFFIX) BUILD_SUPER_IMAGE := build/make/tools/releasetools/build_super_image.py -PROGUARD := external/proguard/bin/proguard.sh +PROGUARD_HOME := external/proguard +PROGUARD := $(PROGUARD_HOME)/bin/proguard.sh +PROGUARD_DEPS := $(PROGUARD) $(PROGUARD_HOME)/lib/proguard.jar JAVATAGS := build/make/tools/java-event-log-tags.py MERGETAGS := build/make/tools/merge-event-log-tags.py BUILD_IMAGE_SRCS := $(wildcard build/make/tools/releasetools/*.py)