From 7028294c9346949a1fbf91fb4ca207f88e62ccfc Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Tue, 19 Mar 2024 12:16:56 -0700
Subject: Demote BareDotMetacharacter to a warning

So that it can be made an error by default.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I776e359c689c6ca51770cedf9fffcb338b6eefe5
---
 Android.bp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index 5d79915a8..82e1e5bf0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -118,16 +118,17 @@ 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",
         ],
     },
 }
@@ -188,6 +189,7 @@ java_library_host {
     errorprone: {
         javacflags: [
             "-Xep:ReturnValueIgnored:WARN",
+            "-Xep:BareDotMetacharacter:WARN",
         ],
     },
 }
-- 
cgit v1.2.3


From ec36038055fe2cd965d24d3ce0039128c760b49c Mon Sep 17 00:00:00 2001
From: Matt Gilbride <mattgilbride@google.com>
Date: Wed, 28 Feb 2024 14:55:12 +0000
Subject: Enable windows target

`//tools/apksig` build targets will soon depend
on this, and windows must be enabled (transitively)
on all dependencies.

Bug: 319296492
Test: TH
Change-Id: I44a6e31d4dc6b0cb0f7507bbf17bffa6d7adf4e8
---
 Android.bp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

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
-- 
cgit v1.2.3