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/static_java_library.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/static_java_library.mk')
| -rw-r--r-- | core/static_java_library.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/static_java_library.mk b/core/static_java_library.mk index c692f9f..e1b9dd0 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -59,7 +59,7 @@ endif LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS) -ifeq ($(LOCAL_USE_JACK),true) +ifeq ($(strip $(LOCAL_USE_JACK)),true) ifndef LOCAL_JACK_PROGUARD_FLAGS LOCAL_JACK_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS) endif @@ -123,7 +123,7 @@ $(R_file_stamp) : $(all_resources) $(full_android_manifest) $(AAPT) $(framework_ $(hide) find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name R.java | xargs cat > $@ $(LOCAL_BUILT_MODULE): $(R_file_stamp) -ifeq ($(LOCAL_USE_JACK),true) +ifeq ($(strip $(LOCAL_USE_JACK)),true) $(noshrob_classes_jack): $(R_file_stamp) $(full_classes_jack): $(R_file_stamp) endif # LOCAL_USE_JACK |