Fix inconsistent application of jarjar rules.
We must apply them to core-all if we're going to use the obfuscation
map that's produced as a result of obfuscating it. If we don't, the
map will contain mappings for the "old" (com.ibm...) names which isn't
what we want.
Change-Id: I6deb103ff377e66c6d3368133ee8b88115b69b14
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index ea03e8e..2e0ea58 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -140,6 +140,7 @@
LOCAL_REQUIRED_MODULES := tzdata
LOCAL_CORE_LIBRARY := true
LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
include $(BUILD_JAVA_LIBRARY)
@@ -258,6 +259,7 @@
LOCAL_REQUIRED_MODULES := tzdata-host
LOCAL_CORE_LIBRARY := true
LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
include $(CLEAR_VARS)