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

am: eb5bad24e0

Change-Id: I16a820217d33532a5254ba2ccdd91fe62512ab88

1 files changed, 15 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index ddcebd0..6535c2c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,3 +37,18 @@ java_library {
     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,
+}