Tweaks to fix client demo app

* Upgrade grpc-java to fix lite proto issue
* Update version targeting
* Fix package name

Change-Id: I1c8fcae09db8bfdf9067e60ac1abcaa173e88c96

.bazelrc

@@ -63,6 +63,10 @@ build:unsafe-fast-presubmit --config=ci
 build:unsafe-fast-presubmit --remote_cache=https://storage.googleapis.com/oak-bazel-cache
 build:unsafe-fast-presubmit --remote_upload_local_results=false
 
+# https://github.com/bazelbuild/bazel/issues/9342
+# --experimental_check_desugar_deps (on by default) breaks Android builds with remote execution
+build:unsafe-fast-presubmit --noexperimental_check_desugar_deps
+
 # Use a custom local bazelrc if present.
 #
 # To set up remote cache write credentials:

WORKSPACE

@@ -81,11 +81,10 @@ grpc_extra_deps()
 # https://github.com/grpc/grpc-java
 http_archive(
     name = "io_grpc_grpc_java",
-    sha256 = "4af5ecbaed16455fcda9fdab36e131696f5092858dd130f026069fcf11817a21",
-    strip_prefix = "grpc-java-1.56.0",
+    sha256 = "4a37fbdf88c8344e14a12bb261aa3eb1401fa47cfc312fb82260592aa993171a",
+    strip_prefix = "grpc-java-1.62.0",
     urls = [
-        # Java gRPC v1.56.0 (2023-06-21).
-        "https://github.com/grpc/grpc-java/archive/refs/tags/v1.56.0.tar.gz",
+        "https://github.com/grpc/grpc-java/archive/refs/tags/v1.62.0.tar.gz",
     ],
 )
 

java/src/main/java/com/google/oak/client/android/AndroidManifest.xml

@@ -1,17 +1,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.oak.functions.android.client"
+    package="com.google.oak.client.android"
     android:versionCode="1"
     android:versionName="1.0" >
 
   <uses-sdk
-      android:minSdkVersion="28"
-      android:targetSdkVersion="28" />
+      android:minSdkVersion="30"
+      android:targetSdkVersion="35" />
   <uses-permission android:name="android.permission.INTERNET"/>
 
   <application
       android:label="Oak Functions Client" android:taskAffinity="">
     <activity
-        android:name="com.google.oak.functions.android.client.MainActivity"
+        android:name="com.google.oak.client.android.MainActivity"
         android:label="Oak Functions Client"
         android:exported="true">
       <intent-filter>

java/src/main/java/com/google/oak/client/android/BUILD

@@ -14,42 +14,38 @@
 # limitations under the License.
 #
 
-# TODO(#4070): Re-enable Android client build.
-#
-#load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library")
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library")
 
 package(
     licenses = ["notice"],
 )
 
-# TODO(#4070): Re-enable Android client build.
-#
-#android_library(
-#    name = "client_activity",
-#    srcs = ["MainActivity.java"],
-#    custom_package = "com.google.oak.client.android",
-#    manifest = "AndroidManifest.xml",
-#    resource_files = glob(["res/**"]),
-#    deps = [
-#        "//java/src/main/java/com/google/oak/client",
-#        "//java/src/main/java/com/google/oak/remote_attestation:insecure_attestation_verifier",
-#        "//java/src/main/java/com/google/oak/transport:api_key_interceptor",
-#        "//java/src/main/java/com/google/oak/transport:grpc_streaming_transport",
-#        "//java/src/main/java/com/google/oak/util",
-#        "//proto/session:service_streaming_java_grpc",
-#        "@com_google_guava_guava",
-#        "@com_google_protobuf//:protobuf_javalite",
-#        "@io_grpc_grpc_java//api",
-#        "@io_grpc_grpc_java//netty",
-#    ],
-#)
-#
-#android_binary(
-#    name = "client_app",
-#    custom_package = "com.google.oak.client.android",
-#    manifest = "AndroidManifest.xml",
-#    multidex = "native",
-#    deps = [
-#        ":client_activity",
-#    ],
-#)
+android_library(
+    name = "client_activity",
+    srcs = ["MainActivity.java"],
+    custom_package = "com.google.oak.client.android",
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    deps = [
+        "//java/src/main/java/com/google/oak/client",
+        "//java/src/main/java/com/google/oak/remote_attestation:insecure_attestation_verifier",
+        "//java/src/main/java/com/google/oak/transport:api_key_interceptor",
+        "//java/src/main/java/com/google/oak/transport:grpc_streaming_transport",
+        "//java/src/main/java/com/google/oak/util",
+        "//proto/session:service_streaming_java_grpc",
+        "@com_google_guava_guava",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@io_grpc_grpc_java//api",
+        "@io_grpc_grpc_java//netty",
+    ],
+)
+
+android_binary(
+    name = "client_app",
+    custom_package = "com.google.oak.client.android",
+    manifest = "AndroidManifest.xml",
+    multidex = "native",
+    deps = [
+        ":client_activity",
+    ],
+)