Merge "Add PROGUARD_HOME and PROGUARD_DEPS" am: 5f93c3a929

am: 8768ded37b

Change-Id: Ida46e98db111b412656bd3573fc0d313b9a45679
This commit is contained in:
Dan Willemsen 2019-01-18 15:11:40 -08:00 committed by android-build-merger
commit 03e61a74a8
1 changed files with 3 additions and 1 deletions

View File

@ -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)