commit b236248e3e65ce42467961b2093266db4a915390
author Matt Gilbride <mattgilbride@google.com> Thu Mar 21 15:45:53 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 21 15:45:53 2024 +0000
tree 0bd80227b5b04a51a77991160a50edaf8ee0b6b8
parent 9e2c42b8300e1565e1d9d9970599cd21619cbffa
parent ec36038055fe2cd965d24d3ce0039128c760b49c

Merge "Enable windows target" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index 82e1e5b..26e65a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,6 +78,10 @@
         host: {
             static_libs: ["guava-jre"],
         },
+        windows: {
+            static_libs: ["guava-jre"],
+            enabled: true,
+        },
     },
     apex_available: [
         "//apex_available:platform",
@@ -96,6 +100,11 @@
         "error_prone_annotations",
     ],
     java_version: "1.8",
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 java_library_host {
@@ -112,6 +121,11 @@
             "-Xep:NoCanIgnoreReturnValueOnClasses:WARN",
         ],
     },
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 java_library_host {
@@ -150,6 +164,11 @@
             "-Xep:NoCanIgnoreReturnValueOnClasses:WARN",
         ],
     },
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 java_host_for_device {
@@ -173,6 +192,11 @@
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 // Compile guava testlib