aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Gilbride <mattgilbride@google.com>2024-03-21 15:45:53 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-21 15:45:53 +0000
commitb236248e3e65ce42467961b2093266db4a915390 (patch)
tree0bd80227b5b04a51a77991160a50edaf8ee0b6b8
parent9e2c42b8300e1565e1d9d9970599cd21619cbffa (diff)
parentec36038055fe2cd965d24d3ce0039128c760b49c (diff)
downloadguava-b236248e3e65ce42467961b2093266db4a915390.tar.gz
Merge "Enable windows target" into mainHEADmastermain
-rw-r--r--Android.bp24
1 files changed, 24 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 82e1e5bf0..26e65a3c6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,6 +78,10 @@ java_library {
host: {
static_libs: ["guava-jre"],
},
+ windows: {
+ static_libs: ["guava-jre"],
+ enabled: true,
+ },
},
apex_available: [
"//apex_available:platform",
@@ -96,6 +100,11 @@ java_library {
"error_prone_annotations",
],
java_version: "1.8",
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library_host {
@@ -112,6 +121,11 @@ java_library_host {
"-Xep:NoCanIgnoreReturnValueOnClasses:WARN",
],
},
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library_host {
@@ -150,6 +164,11 @@ java_library_host {
"-Xep:NoCanIgnoreReturnValueOnClasses:WARN",
],
},
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_host_for_device {
@@ -173,6 +192,11 @@ java_library {
"//apex_available:platform",
"//apex_available:anyapex",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
// Compile guava testlib