Updating Android.bp files (#53)

* Adding device target to the Android.bp file

* Changing Android.bp files of baksmali, smali and dexlib2 to match the current AOSP targets

baksmali/Android.bp

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
- // Create a new baksmali.properties file using the correct version
+// Create a new baksmali.properties file using the correct version
 genrule {
     name: "android-baksmali_version",
-    defaults : ["android-smali_version_defaults"],
+    defaults: ["android-smali_version_defaults"],
     out: ["android-baksmali.properties"],
 }
 
@@ -35,6 +35,7 @@ java_binary_host {
     manifest: "manifest.txt",
 
     static_libs: [
+        "guava",
         "smali-dexlib2",
         "android-smali-util",
         "jcommander",
@@ -43,4 +44,4 @@ java_binary_host {
     java_resources: [":android-baksmali_version"],
 
     wrapper: ":android-baksmali_script",
-}
+}

dexlib2/Android.bp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
- java_library_host {
+java_library_host {
     name: "smali-dexlib2",
 
     srcs: [
@@ -25,6 +25,12 @@
     static_libs: [
         "jsr305",
     ],
+
+    errorprone: {
+        javacflags: [
+            "-Xep:ComparableType:WARN",
+        ],
+    },
 }
 
 java_library_host {
@@ -38,6 +44,12 @@ java_library_host {
     static_libs: [
         "jsr305",
     ],
+
+    errorprone: {
+        javacflags: [
+            "-Xep:ComparableType:WARN",
+        ],
+    },
 }
 
 java_library {
@@ -47,14 +59,25 @@ java_library {
         "src/main/java/**/*.java",
         ":third_party-smali-dexlib2",
     ],
+
+    static_libs: [
+        "jsr305",
+    ],
 
     sdk_version: "system_server_current",
     min_sdk_version: "33",
 
-    static_libs: [
-        "jsr305",
-    ],
+    optimize: {
+        enabled: true,
+        shrink: true,
+    },
 
+    errorprone: {
+        javacflags: [
+            "-Xep:ComparableType:WARN",
+        ],
+    },
+
     apex_available: [
         "//apex_available:anyapex",
     ],

smali/Android.bp

@@ -34,6 +34,7 @@ java_binary_host {
     manifest: "manifest.txt",
 
     static_libs: [
+        "guava",
         "antlr-runtime",
         "jcommander",
         "smali-dexlib2",
@@ -43,4 +44,4 @@ java_binary_host {
     java_resources: [":android-smali_version"],
 
     wrapper: ":android-smali_script",
-}
+}