diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-28 18:10:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-28 18:10:06 +0000 |
| commit | 1147024acef561d14a9fefc6e5b422c2ce0c51f6 (patch) | |
| tree | 0bd80227b5b04a51a77991160a50edaf8ee0b6b8 | |
| parent | 40787da77788171a24da07245913f497a206aa64 (diff) | |
| parent | c32ff9ef5e5a8765ed17ec8e4fcb06007c837525 (diff) | |
| download | guava-build-tools-release.tar.gz | |
Merge "Snap for 11641499 from b236248e3e65ce42467961b2093266db4a915390 to build-tools-release" into build-tools-releasebuild-tools-release
| -rw-r--r-- | Android.bp | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 5d79915a8..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,22 +121,28 @@ java_library_host { "-Xep:NoCanIgnoreReturnValueOnClasses:WARN", ], }, + target: { + windows: { + enabled: true, + }, + }, } java_library_host { name: "guava-testlib", srcs: ["guava-testlib/src/**/*.java"], libs: [ - "error_prone_annotations", - "guava", - "guava-android-annotation-stubs", - "jsr305", - "junit", + "error_prone_annotations", + "guava", + "guava-android-annotation-stubs", + "jsr305", + "junit", ], java_version: "1.8", errorprone: { javacflags: [ "-Xep:ReturnValueIgnored:WARN", + "-Xep:BareDotMetacharacter:WARN", ], }, } @@ -149,6 +164,11 @@ java_library_host { "-Xep:NoCanIgnoreReturnValueOnClasses:WARN", ], }, + target: { + windows: { + enabled: true, + }, + }, } java_host_for_device { @@ -172,6 +192,11 @@ java_library { "//apex_available:platform", "//apex_available:anyapex", ], + target: { + windows: { + enabled: true, + }, + }, } // Compile guava testlib @@ -188,6 +213,7 @@ java_library_host { errorprone: { javacflags: [ "-Xep:ReturnValueIgnored:WARN", + "-Xep:BareDotMetacharacter:WARN", ], }, } |