Revert "Running jarjar on Java resources."
This reverts commit 140274707e31c9585aa28b0de2f1418c64ecd272.
Breaks the build on uiautomator_compat.
Change-Id: I6d14f39e3432bf5e691027bbb8e7260e4bec8e8d
diff --git a/core/base_rules.mk b/core/base_rules.mk
index 883f330..8e423e4 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -409,6 +409,7 @@
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_java_libs)
+$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_jack_libs)
# full_java_libs: The list of files that should be used as the classpath.
# Using this list as a dependency list WILL NOT WORK.
@@ -681,7 +682,7 @@
###########################################################
# JACK
###########################################################
-ifeq ($(LOCAL_USE_JACK),true)
+ifeq ($(strip $(LOCAL_USE_JACK)),true)
ifdef need_compile_java
full_static_jack_libs := \