Snap for 10453938 from 2c447bbbc81be0ba9197a8c70c095db01f9b3690 to mainline-odp-release
Change-Id: I19eb9d601fa0eb0fa0d56862de56cbf8229bd21d
diff --git a/Android.bp b/Android.bp
index 3c03e6c..aa7d9c7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,7 +49,7 @@
"grpc-java-protobuf",
"grpc-java-protobuf-lite",
"grpc-java-stub",
- ]
+ ],
}
java_library {
@@ -63,7 +63,6 @@
"grpc-java-protobuf-lite",
"grpc-java-stub",
],
- visibility: ["//packages/modules/Bluetooth/android/blueberry/server"],
}
java_library {
@@ -78,4 +77,30 @@
"grpc-java-okhttp",
],
sdk_version: "current",
+ min_sdk_version: "30",
+ apex_available: [
+ "com.android.adservices",
+ "com.android.devicelock",
+ "com.android.extservices",
+ ],
+}
+
+java_library {
+ name: "grpc-java-core-android",
+ srcs: [
+ "android/src/main/java/io/grpc/android/*.java",
+ ],
+ libs: [
+ "grpc-java-core",
+ "grpc-java-core-internal",
+ "jsr305",
+ "guava",
+ ],
+ sdk_version: "current",
+ min_sdk_version: "30",
+ apex_available: [
+ "com.android.adservices",
+ "com.android.devicelock",
+ "com.android.extservices",
+ ],
}
diff --git a/METADATA b/METADATA
index d97975c..56c454a 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,16 @@
+name: "grpc-grpc-java"
+description: "An RPC library and framework"
+
third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://grpc.io/"
+ }
+ url {
+ type: GIT
+ value: "https://github.com/grpc/grpc-java"
+ }
+ version: "v1.16.1"
+ last_upgrade_date: { year: 2020 month: 07 day: 24 }
license_type: NOTICE
}
diff --git a/OWNERS b/OWNERS
index f678ac2..fd1e1bf 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,3 @@
-# Default code reviewers picked from top 3 or more developers.
-# Please update this list if you find better candidates.
jdesprez@google.com
-yim@google.com
+krzysio@google.com
+ccross@android.com
diff --git a/annotation-stubs/Android.bp b/annotation-stubs/Android.bp
index 2f1c39c..f22fb10 100644
--- a/annotation-stubs/Android.bp
+++ b/annotation-stubs/Android.bp
@@ -29,6 +29,8 @@
":grpc-java-annotation-stubs-srcjar",
],
sdk_version: "current",
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
}
gensrcs {
diff --git a/auth/Android.bp b/auth/Android.bp
index 6d0b6b2..50437c5 100644
--- a/auth/Android.bp
+++ b/auth/Android.bp
@@ -33,4 +33,6 @@
"guava",
"jsr305",
],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
}
diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp
index 519a28a..b3706f8 100644
--- a/compiler/src/java_plugin/cpp/java_generator.cpp
+++ b/compiler/src/java_plugin/cpp/java_generator.cpp
@@ -6,7 +6,7 @@
#include <map>
#include <set>
#include <vector>
-#include <google/protobuf/compiler/java/java_names.h>
+#include <google/protobuf/compiler/java/names.h>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/descriptor.pb.h>
#include <google/protobuf/io/printer.h>
diff --git a/context/Android.bp b/context/Android.bp
index 814b17a..3531863 100644
--- a/context/Android.bp
+++ b/context/Android.bp
@@ -34,5 +34,13 @@
"guava",
"jsr305",
],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
sdk_version: "current",
+ min_sdk_version: "30",
+ apex_available: [
+ "com.android.adservices",
+ "com.android.devicelock",
+ "com.android.extservices",
+ ],
}
diff --git a/core/Android.bp b/core/Android.bp
index d563293..2ea2f3b 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -36,7 +36,15 @@
"jsr305",
"guava",
],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
sdk_version: "current",
+ min_sdk_version: "30",
+ apex_available: [
+ "com.android.adservices",
+ "com.android.devicelock",
+ "com.android.extservices",
+ ],
}
java_library {
@@ -52,6 +60,8 @@
"jsr305",
"guava",
],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
sdk_version: "current",
}
@@ -66,7 +76,7 @@
"grpc-java-core",
"grpc-java-context",
"jsr305",
- "gson-prebuilt-jar",
+ "gson",
"error_prone_annotations",
"guava",
"opencensus-java-api",
@@ -83,7 +93,20 @@
],
},
},
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
sdk_version: "current",
+ min_sdk_version: "30",
+ apex_available: [
+ "com.android.adservices",
+ "com.android.devicelock",
+ "com.android.extservices",
+ ],
+ errorprone: {
+ javacflags: [
+ "-Xep:BanJNDI:WARN",
+ ],
+ },
}
java_library {
@@ -98,5 +121,7 @@
"jsr305",
"guava",
],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
sdk_version: "current",
}
diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp
index e4563a1..3fe93f0 100644
--- a/netty/shaded/Android.bp
+++ b/netty/shaded/Android.bp
@@ -40,5 +40,5 @@
static_libs: [
"grpc-netty-shaded-1.16.1-jar",
],
- visibility: ["//packages/modules/Bluetooth/android/blueberry/server"],
+ visibility: ["//packages/modules/Bluetooth/android/pandora/server"],
}
diff --git a/okhttp/Android.bp b/okhttp/Android.bp
index 7212a3f..87012c7 100644
--- a/okhttp/Android.bp
+++ b/okhttp/Android.bp
@@ -42,4 +42,10 @@
"okhttp-norepackage",
],
sdk_version: "current",
+ min_sdk_version: "30",
+ apex_available: [
+ "com.android.adservices",
+ "com.android.devicelock",
+ "com.android.extservices",
+ ],
}
diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp
index 2a2ed94..22e3fb7 100644
--- a/protobuf-lite/Android.bp
+++ b/protobuf-lite/Android.bp
@@ -35,5 +35,13 @@
"jsr305",
"libprotobuf-java-lite",
],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
sdk_version: "current",
+ min_sdk_version: "30",
+ apex_available: [
+ "com.android.adservices",
+ "com.android.devicelock",
+ "com.android.extservices",
+ ],
}
diff --git a/protobuf/Android.bp b/protobuf/Android.bp
index f51c272..4f10a5e 100644
--- a/protobuf/Android.bp
+++ b/protobuf/Android.bp
@@ -38,4 +38,6 @@
"libprotobuf-java-full",
"libprotobuf-java-util-full",
],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
}
diff --git a/stub/Android.bp b/stub/Android.bp
index 466195d..65c87a9 100644
--- a/stub/Android.bp
+++ b/stub/Android.bp
@@ -35,5 +35,13 @@
"guava",
"jsr305",
],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
sdk_version: "current",
+ min_sdk_version: "30",
+ apex_available: [
+ "com.android.adservices",
+ "com.android.devicelock",
+ "com.android.extservices",
+ ],
}
diff --git a/testing/Android.bp b/testing/Android.bp
index 2d2a1c6..11595de 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -45,4 +45,6 @@
"junit",
],
sdk_version: "current",
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
}