aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Gilbride <mattgilbride@google.com>2024-02-28 14:50:05 +0000
committerMatt Gilbride <mattgilbride@google.com>2024-03-18 14:27:52 +0000
commit0294829446a576345444f3cb28be2b01c6ea3c9f (patch)
tree8ac80515d1ce246f34acefadd32a655dee53477f
parent10c6e11ed5d64ed17ad7193e6bfa12ba0d636498 (diff)
downloadprotobuf-0294829446a576345444f3cb28be2b01c6ea3c9f.tar.gz
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
-rw-r--r--Android.bp13
1 files changed, 13 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index fd3c2db83..5f3eef894 100644
--- a/Android.bp
+++ b/Android.bp
@@ -603,6 +603,9 @@ java_library_static {
android: {
libs: ["libcore_private.stubs"],
},
+ windows: {
+ enabled: true,
+ },
},
java_version: "1.7",
@@ -644,6 +647,11 @@ java_library_host {
},
java_version: "1.7",
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library_host {
@@ -661,6 +669,11 @@ java_library_host {
],
// 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)