Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: If5097d11103ef25782706abcbe6480c200a28be9
Change-Id: I6c1b45e894f2c4282f9b2a7e73e2f2cece085ab5
diff --git a/annotation-stubs/Android.bp b/annotation-stubs/Android.bp
index afd0b43..929eb59 100644
--- a/annotation-stubs/Android.bp
+++ b/annotation-stubs/Android.bp
@@ -38,6 +38,11 @@
"com.android.devicelock",
"com.android.extservices",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
python_binary_host {
diff --git a/api/Android.bp b/api/Android.bp
index 80f0c13..3426b7a 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -35,4 +35,9 @@
"com.android.devicelock",
"com.android.extservices",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/auth/Android.bp b/auth/Android.bp
index 551c36f..9654dd1 100644
--- a/auth/Android.bp
+++ b/auth/Android.bp
@@ -36,4 +36,9 @@
],
// 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 6143d4f..72e7222 100644
--- a/context/Android.bp
+++ b/context/Android.bp
@@ -44,4 +44,9 @@
"com.android.extservices",
"//apex_available:platform",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/core/Android.bp b/core/Android.bp
index b573450..f804f54 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -49,6 +49,11 @@
"com.android.extservices",
"//apex_available:platform",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library {
@@ -105,6 +110,9 @@
"annotations", // For android.annotation.SuppressLint
]
},
+ windows: {
+ enabled: true,
+ },
},
// b/267831518: Pin tradefed and dependencies to Java 11.
java_version: "11",
@@ -148,4 +156,9 @@
"com.android.extservices",
"//apex_available:platform",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp
index 3c9bf70..246fcd5 100644
--- a/netty/shaded/Android.bp
+++ b/netty/shaded/Android.bp
@@ -38,6 +38,11 @@
"guava",
"perfmark-api-lib",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library {
diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp
index 4a0fc96..27d8256 100644
--- a/protobuf-lite/Android.bp
+++ b/protobuf-lite/Android.bp
@@ -46,4 +46,9 @@
"com.android.extservices",
"//apex_available:platform",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/protobuf/Android.bp b/protobuf/Android.bp
index 0c34790..2b36054 100644
--- a/protobuf/Android.bp
+++ b/protobuf/Android.bp
@@ -41,4 +41,9 @@
],
// 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 553d5f7..e143b4e 100644
--- a/stub/Android.bp
+++ b/stub/Android.bp
@@ -47,4 +47,9 @@
"com.android.extservices",
"//apex_available:platform",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
