aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Gilbride <mattgilbride@google.com>2024-02-28 21:26:43 +0000
committerMatt Gilbride <mattgilbride@google.com>2024-03-21 15:46:35 +0000
commit6bb3159fb11f77d36785023be6e76fb2ac0644cf (patch)
tree4422cc0f59501dc9f484b33e7282eda15caff159
parent7e8f516426373392cda1e065b9ad5a66fc00d30f (diff)
downloadgrpc-grpc-java-6bb3159fb11f77d36785023be6e76fb2ac0644cf.tar.gz
Enable windows targetHEADmastermain
`//tools/apksig` build targets will soon depend on this, and windows must be enabled (transitively) on all dependencies. Bug: 319296492 Test: TH Change-Id: I601fecdc6c6c0898c90556c4c2aa1d24df66bbfd
-rw-r--r--annotation-stubs/Android.bp5
-rw-r--r--api/Android.bp5
-rw-r--r--auth/Android.bp5
-rw-r--r--context/Android.bp5
-rw-r--r--core/Android.bp13
-rw-r--r--netty/shaded/Android.bp5
-rw-r--r--protobuf-lite/Android.bp5
-rw-r--r--protobuf/Android.bp5
-rw-r--r--stub/Android.bp5
9 files changed, 53 insertions, 0 deletions
diff --git a/annotation-stubs/Android.bp b/annotation-stubs/Android.bp
index afd0b431e..929eb598c 100644
--- a/annotation-stubs/Android.bp
+++ b/annotation-stubs/Android.bp
@@ -38,6 +38,11 @@ java_library {
"com.android.devicelock",
"com.android.extservices",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
python_binary_host {
diff --git a/api/Android.bp b/api/Android.bp
index 80f0c1359..3426b7acc 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -35,4 +35,9 @@ java_library {
"com.android.devicelock",
"com.android.extservices",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/auth/Android.bp b/auth/Android.bp
index 551c36f9c..9654dd1b0 100644
--- a/auth/Android.bp
+++ b/auth/Android.bp
@@ -36,4 +36,9 @@ java_library_host {
],
// b/267831518: Pin tradefed and dependencies to Java 11.
java_version: "11",
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/context/Android.bp b/context/Android.bp
index 6143d4fc4..72e72226f 100644
--- a/context/Android.bp
+++ b/context/Android.bp
@@ -44,4 +44,9 @@ java_library {
"com.android.extservices",
"//apex_available:platform",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/core/Android.bp b/core/Android.bp
index b5734509f..f804f54a6 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -49,6 +49,11 @@ java_library {
"com.android.extservices",
"//apex_available:platform",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library {
@@ -105,6 +110,9 @@ java_library {
"annotations", // For android.annotation.SuppressLint
]
},
+ windows: {
+ enabled: true,
+ },
},
// b/267831518: Pin tradefed and dependencies to Java 11.
java_version: "11",
@@ -148,4 +156,9 @@ java_library {
"com.android.extservices",
"//apex_available:platform",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp
index 3c9bf706b..246fcd509 100644
--- a/netty/shaded/Android.bp
+++ b/netty/shaded/Android.bp
@@ -38,6 +38,11 @@ java_library_host {
"guava",
"perfmark-api-lib",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library {
diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp
index 4a0fc9645..27d82566d 100644
--- a/protobuf-lite/Android.bp
+++ b/protobuf-lite/Android.bp
@@ -46,4 +46,9 @@ java_library {
"com.android.extservices",
"//apex_available:platform",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/protobuf/Android.bp b/protobuf/Android.bp
index 0c347905f..2b3605466 100644
--- a/protobuf/Android.bp
+++ b/protobuf/Android.bp
@@ -41,4 +41,9 @@ java_library_host {
],
// b/267831518: Pin tradefed and dependencies to Java 11.
java_version: "11",
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/stub/Android.bp b/stub/Android.bp
index 553d5f7c2..e143b4e20 100644
--- a/stub/Android.bp
+++ b/stub/Android.bp
@@ -47,4 +47,9 @@ java_library {
"com.android.extservices",
"//apex_available:platform",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}