aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-03-30 13:58:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-30 13:58:14 +0000
commit8b3bb789abcfcd4c47774e1989114b64ca0e5ae1 (patch)
tree31a425387068c0b4dc75a270cf765cb98ed83c39
parent89e2aece8546e9e86ac0051f56a8ea0591e68690 (diff)
parent0294829446a576345444f3cb28be2b01c6ea3c9f (diff)
downloadprotobuf-8b3bb789abcfcd4c47774e1989114b64ca0e5ae1.tar.gz
Merge "Enable windows targets for protobuf" into mainHEADmastermain
-rw-r--r--Android.bp13
1 files changed, 13 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index a2a2cbdc8..6200c48f2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -604,6 +604,9 @@ java_library_static {
android: {
libs: ["libcore_private.stubs"],
},
+ windows: {
+ enabled: true,
+ },
},
java_version: "1.7",
@@ -645,6 +648,11 @@ java_library_host {
},
java_version: "1.7",
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library_host {
@@ -662,6 +670,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)