commit 0294829446a576345444f3cb28be2b01c6ea3c9f
author Matt Gilbride <mattgilbride@google.com> Wed Feb 28 14:50:05 2024 +0000
committer Matt Gilbride <mattgilbride@google.com> Mon Mar 18 14:27:52 2024 +0000
tree 8ac80515d1ce246f34acefadd32a655dee53477f
parent 10c6e11ed5d64ed17ad7193e6bfa12ba0d636498

Enable windows targets for protobuf

The `apksig`/`apksigner` build targets
now rely on protbuf, and windows must
be enabled (transitively) on all dependencies

Bug: 319296492
Test: TH
Change-Id: I7304e19b07a4b37dafbbc8496b153436f1d120f0

Android.bp

diff --git a/Android.bp b/Android.bp
index fd3c2db..5f3eef8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -603,6 +603,9 @@
         android: {
             libs: ["libcore_private.stubs"],
         },
+        windows: {
+            enabled: true,
+        },
     },
 
     java_version: "1.7",
@@ -644,6 +647,11 @@
     },
 
     java_version: "1.7",
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 java_library_host {
@@ -661,6 +669,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)