Merge "Remove unnecessary opencensus dep" into main am: 3a249b9222
Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/3237273
Change-Id: I2928eb517a3ca24af8278ba5060e74eb8a29e587
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index 7b1077c..78a59d3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,6 +37,15 @@
],
}
+java_defaults {
+ name: "grpc-java-default-visibility",
+ visibility: [
+ "//external/grpc-grpc-java:__subpackages__",
+ "//external/sdk-platform-java:__subpackages__",
+ "//tools/apksig",
+ ],
+}
+
java_library_host {
name: "grpc-java",
static_libs: [
@@ -51,6 +60,11 @@
"grpc-java-reflection",
"grpc-java-stub",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library {
@@ -84,7 +98,7 @@
apex_available: [
"com.android.adservices",
"com.android.devicelock",
- "com.android.extservices"
+ "com.android.extservices",
],
}
diff --git a/alts/Android.bp b/alts/Android.bp
new file mode 100644
index 0000000..afc23bb
--- /dev/null
+++ b/alts/Android.bp
@@ -0,0 +1,40 @@
+java_library_host {
+ name: "grpc-java-alts",
+ defaults: ["grpc-java-default-visibility"],
+ srcs: [
+ "src/generated/main/**/*.java",
+ "src/main/java/**/*.java",
+ "src/main/proto/**/*.proto",
+ ],
+ libs: [
+ "auto_value_annotations",
+ "libprotobuf-java-util-full",
+ "google-auth-library-java-credentials",
+ "google-auth-library-java-oauth2_http",
+ "grpc-java-api",
+ "grpc-java-auth",
+ "grpc-java-context",
+ "grpc-java-core",
+ "grpc-java-core-internal",
+ "grpc-java-core-util",
+ "grpc-java-grpclb",
+ "grpc-java-netty",
+ "grpc-java-protobuf",
+ "grpc-java-protobuf-lite",
+ "grpc-java-stub",
+ "guava",
+ "javax_annotation-api_1.3.2",
+ "netty-unshaded-1.56.0",
+ ],
+ proto: {
+ type: "full",
+ canonical_path_from_root: false,
+ include_dirs: ["external/protobuf/src"],
+ local_include_dirs: ["src/main/proto"],
+ },
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
+}
diff --git a/core/Android.bp b/core/Android.bp
index 277953f..a20cb51 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -75,6 +75,11 @@
// b/267831518: Pin tradefed and dependencies to Java 11.
java_version: "11",
sdk_version: "current",
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library {
diff --git a/grpclb/Android.bp b/grpclb/Android.bp
new file mode 100644
index 0000000..4b70164
--- /dev/null
+++ b/grpclb/Android.bp
@@ -0,0 +1,34 @@
+java_library_host {
+ name: "grpc-java-grpclb",
+ defaults: ["grpc-java-default-visibility"],
+ srcs: [
+ "src/generated/main/**/*.java",
+ "src/main/java/**/*.java",
+ "src/main/proto/**/*.proto",
+ ],
+ libs: [
+ "auto_value_annotations",
+ "libprotobuf-java-util-full",
+ "grpc-java-api",
+ "grpc-java-context",
+ "grpc-java-core",
+ "grpc-java-core-internal",
+ "grpc-java-core-util",
+ "grpc-java-protobuf",
+ "grpc-java-protobuf-lite",
+ "grpc-java-stub",
+ "guava",
+ "javax_annotation-api_1.3.2",
+ ],
+ proto: {
+ type: "full",
+ canonical_path_from_root: false,
+ include_dirs: ["external/protobuf/src"],
+ local_include_dirs: ["src/main/proto"],
+ },
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
+}
diff --git a/netty/Android.bp b/netty/Android.bp
new file mode 100644
index 0000000..a348772
--- /dev/null
+++ b/netty/Android.bp
@@ -0,0 +1,29 @@
+java_library_host {
+ name: "netty-unshaded-1.56.0",
+ defaults: ["grpc-java-default-visibility"],
+ static_libs: ["grpc-netty-shaded-1.56.0-jar"],
+ jarjar_rules: "netty-unshaded.txt",
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
+}
+
+java_library_host {
+ name: "grpc-java-netty",
+ srcs: ["src/main/java/**/*.java"],
+ libs: [
+ "netty-unshaded-1.56.0",
+ "grpc-java-api",
+ "grpc-java-core",
+ "grpc-java-core-internal",
+ "guava",
+ "perfmark",
+ ],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
+}
diff --git a/netty/netty-unshaded.txt b/netty/netty-unshaded.txt
new file mode 100644
index 0000000..88f4171
--- /dev/null
+++ b/netty/netty-unshaded.txt
@@ -0,0 +1,3 @@
+rule io.grpc.netty.shaded.io.netty.** io.netty.@1
+zap io.grpc.netty.shaded.io.grpc.**
+
diff --git a/services/Android.bp b/services/Android.bp
index f599aeb..023d44c 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -30,6 +30,11 @@
visibility: ["//visibility:private"],
// b/267831518: Pin tradefed and dependencies to Java 11.
java_version: "11",
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
java_library_host {
@@ -60,4 +65,9 @@
],
// b/267831518: Pin tradefed and dependencies to Java 11.
java_version: "11",
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
