From 9b3c02f8d1cf0e0fde6faaaf63bb0179af383100 Mon Sep 17 00:00:00 2001
From: Andrei Onea <andreionea@google.com>
Date: Thu, 30 Apr 2020 13:05:32 +0100
Subject: Add dexlib target that doesn't bundle commons-cli

Test: atest com.android.compatibility.common.tradefed.presubmit.DupFileTest#testDupFilesExist
Test: atest CtsStrictJavaPackagesTestCases
Bug: 153627444
Change-Id: I20da5e9df65630ef65c0b341eabe5c36f1a11f4c
---
 dexlib2/Android.bp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dexlib2/Android.bp b/dexlib2/Android.bp
index c5b0ebdb..4132d45c 100644
--- a/dexlib2/Android.bp
+++ b/dexlib2/Android.bp
@@ -47,3 +47,21 @@ java_library_host {
         "jsr305",
     ],
 }
+
+java_library_host {
+    name: "dexlib2-no-guava-no-cli",
+
+    srcs: [
+        "src/main/java/**/*.java",
+    ],
+
+    libs: [
+        "guava",
+        "commons-cli-1.2",
+    ],
+
+    static_libs: [
+        "jcommander",
+        "jsr305",
+    ],
+}
\ No newline at end of file
-- 
cgit v1.2.3