commit ccc2296752f71b250bc8b5ea24eff53fb331743d
author Neil Fuller <nfuller@google.com> Sat Dec 08 16:45:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 08 16:45:53 2018 +0000
tree b596236e879528cdfdc5d17c7c448e224218c593
parent 8a4884e2f01955357fe96a1210692230464ee5fe
parent 87f721d6136d5c6c5e2a34067f9ad58401c8f51e

Merge "Add a -testdex target for apache-xml on device"

Android.bp

diff --git a/Android.bp b/Android.bp
index ddcebd0..6535c2c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,3 +37,18 @@
     libs: ["core-all"],
     system_modules: "core-all-system-modules",
 }
+
+// A guaranteed unstripped version of apache-xml for use on device.
+// The build system may or may not strip the apache-xml jar, but this one will
+// not be stripped. See b/24535627.
+java_library {
+    name: "apache-xml-testdex",
+    static_libs: ["apache-xml"],
+
+    installable: true,
+    dex_preopt: {
+        enabled: false,
+    },
+
+    no_framework_libs: true,
+}