pw_log: Fix Logger impl and build targets

The build targets didn't work when imported into Android and also showed
a build error relating to using Level in a switch statement since it
can't be converted to an int.

Change-Id: Id461da0825257d615ca6b6b9e985562a89d4f63f
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/89962
Reviewed-by: Wyatt Hepler <hepler@google.com>
Commit-Queue: Anthony Stange <stange@google.com>

5 files changed, 37 insertions, 22 deletions

diff --git a/pw_log/Android.bp b/pw_log/Android.bp
index 9b5bb34f9..d9cadd4b8 100644
--- a/pw_log/Android.bp
+++ b/pw_log/Android.bp
@@ -21,9 +21,8 @@ cc_library {
     ],
 }
 
-java_library {
+android_library {
     name: "pw_log_android_java",
-    host_supported: true,
     srcs: ["java/android_main/dev/pigweed/pw_log/*.java"],
     visibility: ["//visibility:public"],
     sdk_version: "current",
diff --git a/pw_log/AndroidManifest.xml b/pw_log/AndroidManifest.xml
new file mode 100644
index 000000000..f2da03fb7
--- /dev/null
+++ b/pw_log/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<!--
+   Copyright 2022 The Pigweed Authors
+
+   Licensed under the Apache License, Version 2.0 (the "License"); you may not
+   use this file except in compliance with the License. You may obtain a copy of
+   the License at
+
+   https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+   License for the specific language governing permissions and limitations under
+   the License.
+-->
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="dev.pigweed.pw_log" >
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="32" />
+</manifest>
diff --git a/pw_log/java/android_main/dev/pigweed/pw_log/Logger.java b/pw_log/java/android_main/dev/pigweed/pw_log/Logger.java
index 01d47aba2..3390011a4 100644
--- a/pw_log/java/android_main/dev/pigweed/pw_log/Logger.java
+++ b/pw_log/java/android_main/dev/pigweed/pw_log/Logger.java
@@ -30,29 +30,22 @@ public final class Logger {
     private Throwable cause = null;
 
     private AndroidLogApi(Level level) {
-      switch (level) {
-        case Level.FINEST:
-        case Level.FINER:
-          this.level = Log.VERBOSE;
-          break;
-        case Level.FINE:
-        case Level.CONFIG:
-          this.level = Log.DEBUG;
-          break;
-        case Level.INFO:
-          this.level = Log.INFO;
-          break;
-        case Level.WARNING:
-          this.level = Log.WARN;
-          break;
-        case Level.SEVERE:
-          this.level = Log.ERROR;
-          break;
+      if (level == Level.FINEST || level == Level.FINER) {
+        this.level = Log.VERBOSE;
+      } else if (level == Level.FINE || level == Level.CONFIG) {
+        this.level = Log.DEBUG;
+      } else if (level == Level.WARNING) {
+        this.level = Log.WARN;
+      } else if (level == Level.SEVERE) {
+        this.level = Log.ERROR;
+      } else {
+        this.level = Log.INFO;
       }
     }
 
-    public AndroidLogApi withCause(Throwable casue) {
+    public AndroidLogApi withCause(Throwable cause) {
       this.cause = cause;
+      return this;
     }
 
     public void log(String message) {
diff --git a/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py b/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
index a0cbe83b8..d7b65d32c 100755
--- a/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
+++ b/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
@@ -532,6 +532,7 @@ _EXCLUDE_FROM_COPYRIGHT_NOTICE: Sequence[str] = (
     r'\.json$',
     r'\.png$',
     r'\.svg$',
+    r'\.xml$',
     # Documentation
     r'\.md$',
     r'\.rst$',
diff --git a/pw_rpc/Android.bp b/pw_rpc/Android.bp
index 9bb863871..3913566a8 100644
--- a/pw_rpc/Android.bp
+++ b/pw_rpc/Android.bp
@@ -14,7 +14,6 @@
 
 java_library {
     name: "pw_rpc_java_client",
-    host_supported: true,
     srcs: ["java/main/dev/pigweed/pw_rpc/*.java"],
     visibility: ["//visibility:public"],
     static_libs: [