Snap for 6564541 from 72820d5b485aa150e701fd88b33ecfb02bea9553 to sc-release

Change-Id: I0460535e451816678fe1726dd3ddad0b3ac84697

8 files changed, 199 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 67278a936..f7835ef33 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,10 +17,14 @@
 java_library_host {
     name: "grpc-java",
     static_libs: [
+        "grpc-java-context",
         "grpc-java-core",
-	"grpc-java-context",
-	"grpc-java-protobuf",
-	"grpc-java-stub",
-	"grpc-java-netty-shaded",
+        "grpc-java-core-inprocess",
+        "grpc-java-core-internal",
+        "grpc-java-core-util",
+        "grpc-java-netty-shaded",
+        "grpc-java-protobuf",
+        "grpc-java-protobuf-lite",
+        "grpc-java-stub",
     ]
 }
diff --git a/annotation-stubs/Android.bp b/annotation-stubs/Android.bp
new file mode 100644
index 000000000..32d177a81
--- /dev/null
+++ b/annotation-stubs/Android.bp
@@ -0,0 +1,38 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// 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
+//
+//      http://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.
+//
+
+java_library_host {
+    name: "grpc-java-annotation-stubs",
+    srcs: [
+        ":grpc-java-annotation-stubs-srcjar",
+    ],
+}
+
+gensrcs {
+    name: "grpc-java-annotation-stubs-srcjar",
+    tool_files: [
+        "gen_annotations.py",
+    ],
+    tools: [
+        "soong_zip",
+    ],
+    cmd: "$(location gen_annotations.py) $(genDir)/java && " +
+         "$(location soong_zip) -jar -o $(out) -C $(genDir)/java -D $(genDir)/java",
+    srcs: [
+        // A dummy source file since Soong crashes otherwise.
+        "Android.bp",
+    ],
+    output_extension: "srcjar",
+}
diff --git a/annotation-stubs/gen_annotations.py b/annotation-stubs/gen_annotations.py
new file mode 100755
index 000000000..10c33fa7d
--- /dev/null
+++ b/annotation-stubs/gen_annotations.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2020 The Android Open Source Project
+#
+# 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
+#
+#      http://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.
+"""Generates stubs for annotations that aren't in the Android source tree."""
+
+import pathlib
+import string
+import sys
+
+_ANNOTATIONS_CLASSES = ['org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement']
+
+_CLASS_TEMPLATE = string.Template("""
+package ${package_name};
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({
+    ElementType.ANNOTATION_TYPE,
+    ElementType.CONSTRUCTOR,
+    ElementType.FIELD,
+    ElementType.LOCAL_VARIABLE,
+    ElementType.METHOD,
+    ElementType.PACKAGE,
+    ElementType.PARAMETER,
+    ElementType.TYPE,
+    ElementType.TYPE_PARAMETER,
+    ElementType.TYPE_USE})
+@Retention(RetentionPolicy.SOURCE)
+public @interface ${class_name} {}
+""")
+
+if __name__ == '__main__':
+  out_dir = pathlib.Path(sys.argv[1])
+
+  for c in _ANNOTATIONS_CLASSES:
+    parts = c.split('.')
+    src_path = out_dir.joinpath(*parts).with_suffix('.java')
+    src_path.parent.mkdir(parents=True)
+    src_path.write_text(
+        _CLASS_TEMPLATE.substitute(
+            package_name='.'.join(parts[:-1]), class_name=parts[-1]))
diff --git a/core/Android.bp b/core/Android.bp
index 1d7d87ebd..ed371b0d0 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -12,12 +12,63 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// TODO: build from source instead
 
-java_import_host {
+java_library_host {
     name: "grpc-java-core",
-    jars: [
-        "grpc-core-1.14.0.jar",
+    srcs: [
+        "src/main/java/io/grpc/*.java",
+    ],
+    java_resource_dirs: [
+        "src/main/resources",
+    ],
+    libs: [
+        "grpc-java-context",
+        "jsr305",
+        "guava",
     ],
 }
 
+java_library_host {
+    name: "grpc-java-core-inprocess",
+    srcs: [
+        "src/main/java/io/grpc/inprocess/*.java",
+    ],
+    libs: [
+        "grpc-java-core",
+        "grpc-java-core-internal",
+        "grpc-java-context",
+        "jsr305",
+        "guava",
+    ],
+}
+
+java_library_host {
+    name: "grpc-java-core-internal",
+    srcs: [
+        "src/main/java/io/grpc/internal/*.java",
+    ],
+    libs: [
+        "grpc-java-annotation-stubs",
+        "grpc-java-core",
+        "grpc-java-context",
+        "jsr305",
+        "gson-prebuilt-jar",
+        "error_prone_annotations",
+        "guava",
+        "opencensus-java-api",
+        "opencensus-java-contrib-grpc-metrics",
+    ],
+}
+
+java_library_host {
+    name: "grpc-java-core-util",
+    srcs: [
+        "src/main/java/io/grpc/util/*.java",
+    ],
+    libs: [
+        "grpc-java-core",
+        "grpc-java-core-internal",
+        "jsr305",
+        "guava",
+    ],
+}
diff --git a/core/grpc-core-1.14.0.jar b/core/grpc-core-1.14.0.jar
deleted file mode 100644
index 4057e1a17..000000000
--- a/core/grpc-core-1.14.0.jar
+++ /dev/null
diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp
new file mode 100644
index 000000000..a8374f5be
--- /dev/null
+++ b/protobuf-lite/Android.bp
@@ -0,0 +1,28 @@
+// Copyright (C) 2020 The Android Open Source Project
+//
+// 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
+//
+//      http://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.
+//
+//
+
+java_library_host {
+    name: "grpc-java-protobuf-lite",
+    srcs: [
+        "src/main/java/**/*.java",
+    ],
+    libs: [
+        "grpc-java-core",
+        "guava",
+        "jsr305",
+        "libprotobuf-java-full",
+    ],
+}
diff --git a/protobuf/Android.bp b/protobuf/Android.bp
index cec1d76aa..3e1d243f9 100644
--- a/protobuf/Android.bp
+++ b/protobuf/Android.bp
@@ -13,10 +13,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// TODO: Build from source instead
-java_import_host {
+//
+
+java_library_host {
     name: "grpc-java-protobuf",
-    jars: [
-        "grpc-protobuf-1.14.0.jar",
+    srcs: [
+        "src/main/java/**/*.java",
+    ],
+    libs: [
+        "grpc-java-core",
+        "grpc-java-protobuf-lite",
+        "com.google.api.grpc_proto-google-common-protos-prebuilt-jar",
+        "jsr305",
+        "guava",
+        "libprotobuf-java-full",
+        "libprotobuf-java-util-full",
     ],
 }
diff --git a/protobuf/grpc-protobuf-1.14.0.jar b/protobuf/grpc-protobuf-1.14.0.jar
deleted file mode 100644
index c9bad6938..000000000
--- a/protobuf/grpc-protobuf-1.14.0.jar
+++ /dev/null