Merge "Create version of dexlib2 without guava built in"android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-n-iot-release-ihome-igv1nougat-iot-release

1 files changed, 19 insertions, 0 deletions

diff --git a/dexlib2/Android.bp b/dexlib2/Android.bp
index e9fab201..6d3769bb 100644
--- a/dexlib2/Android.bp
+++ b/dexlib2/Android.bp
@@ -30,3 +30,22 @@ java_library_host {
         "smali-util",
     ],
 }
+
+java_library_host {
+    name: "dexlib2-no-guava",
+
+    srcs: [
+        "src/main/java/**/*.java",
+    ],
+
+    libs: [
+        "guava",
+    ],
+
+    static_libs: [
+        "commons-cli-1.2",
+        "jcommander",
+        "jsr305",
+        "smali-util",
+    ],
+}