commit 8b3bb789abcfcd4c47774e1989114b64ca0e5ae1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Mar 30 13:58:14 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 30 13:58:14 2024 +0000
tree 31a425387068c0b4dc75a270cf765cb98ed83c39
parent 89e2aece8546e9e86ac0051f56a8ea0591e68690
parent 0294829446a576345444f3cb28be2b01c6ea3c9f

Merge "Enable windows targets for protobuf" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index a2a2cbd..6200c48 100644
--- a/Android.bp
+++ b/Android.bp
@@ -604,6 +604,9 @@
         android: {
             libs: ["libcore_private.stubs"],
         },
+        windows: {
+            enabled: true,
+        },
     },
 
     java_version: "1.7",
@@ -645,6 +648,11 @@
     },
 
     java_version: "1.7",
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 java_library_host {
@@ -662,6 +670,11 @@
     ],
     // b/267831518: Pin tradefed and dependencies to Java 11.
     java_version: "11",
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 // Java full library (compatibility for old host-side users)