diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-21 11:04:22 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-01-21 11:04:22 +0000 |
| commit | c1ed9796bb14cb6257b3550caac107abc7b1aa79 (patch) | |
| tree | ae0d287089e4efc8ca4d84ca66399949fdc9cfa5 /core/java.mk | |
| parent | 140274707e31c9585aa28b0de2f1418c64ecd272 (diff) | |
| download | build-c1ed9796bb14cb6257b3550caac107abc7b1aa79.zip build-c1ed9796bb14cb6257b3550caac107abc7b1aa79.tar.gz build-c1ed9796bb14cb6257b3550caac107abc7b1aa79.tar.bz2 | |
Revert "Running jarjar on Java resources."
This reverts commit 140274707e31c9585aa28b0de2f1418c64ecd272.
Breaks the build on uiautomator_compat.
Change-Id: I6d14f39e3432bf5e691027bbb8e7260e4bec8e8d
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java.mk b/core/java.mk index e0864ae..a2bd00b 100644 --- a/core/java.mk +++ b/core/java.mk @@ -474,7 +474,7 @@ legacy_proguard_flags := -injars $(link_instr_classes_jar) \ -verbose \ $(legacy_proguard_flags) # not supported with jack -ifeq ($(LOCAL_USE_JACK),true) +ifeq ($(strip $(LOCAL_USE_JACK)),true) $(error $(LOCAL_MODULE): Build with jack of instrumentation when obfuscating is not yet supported) endif @@ -565,7 +565,7 @@ $(LOCAL_MODULE)-findbugs : $(findbugs_html) endif # full_classes_jar is defined -ifeq ($(LOCAL_USE_JACK),true) +ifeq ($(strip $(LOCAL_USE_JACK)),true) $(LOCAL_INTERMEDIATE_TARGETS): \ PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack |