Fix grpc-java target am: 4d84fe10a4 am: 54952e8341

am: 701a5d1190

Change-Id: I94022b55658fb30ee6b64a2c66fce4cbf5ff9c6c

5 files changed, 7 insertions, 44 deletions

diff --git a/Android.bp b/Android.bp
index 15c5f325a..67278a936 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,6 +19,7 @@ java_library_host {
     static_libs: [
         "grpc-java-core",
 	"grpc-java-context",
+	"grpc-java-protobuf",
 	"grpc-java-stub",
 	"grpc-java-netty-shaded",
     ]
diff --git a/core/Android.bp b/core/Android.bp
index 32623fefa..1d7d87ebd 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -12,20 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-//
+// TODO: build from source instead
 
-java_library_static {
+java_import_host {
     name: "grpc-java-core",
-    host_supported: true,
-    srcs: [
-        "src/main/java/io/grpc/*.java",
-    ],
-    java_resource_dirs: [
-        "core/src/main/resources",
-    ],
-    libs: [
-        "grpc-java-context",
-        "guava",
-        "jsr305",
+    jars: [
+        "grpc-core-1.14.0.jar",
     ],
 }
+
diff --git a/core/grpc-core-1.14.0.jar b/core/grpc-core-1.14.0.jar
new file mode 100644
index 000000000..4057e1a17
--- /dev/null
+++ b/core/grpc-core-1.14.0.jar
diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp
deleted file mode 100644
index 64ce02d2d..000000000
--- a/protobuf-lite/Android.bp
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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 {
-    name: "grpc-java-protobuf-lite",
-    host_supported: true,
-    srcs: [
-        "src/main/java/**/*.java",
-    ],
-    libs: [
-        "grpc-java-core",
-        "guava",
-        "jsr305",
-        "libprotobuf-java-lite",
-    ],
-}
diff --git a/stub/Android.bp b/stub/Android.bp
index 7d8897109..4a56f7eef 100644
--- a/stub/Android.bp
+++ b/stub/Android.bp
@@ -14,9 +14,8 @@
 //
 //
 
-java_library_static {
+java_library_host {
     name: "grpc-java-stub",
-    host_supported: true,
     srcs: [
         "src/main/java/**/*.java",
     ],