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

Commit 8768ded3 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Add PROGUARD_HOME and PROGUARD_DEPS" 

am: 5f93c3a9

Change-Id: Ia3427ad28240fb524aa5ddcd37ed169bca62c9df
parents 622ad444 5f93c3a9

core/config.mk

+3 −1
Original line number Diff line number Diff line
@@ -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)