Merge tag 'android-13.0.0_r16' into int/13/fp3
Android 13.0.0 Release 16 (TQ1A.221205.011)
* tag 'android-13.0.0_r16':
Replace gensrcs with java_library to deprecate depfile in gensrcs
Change-Id: I4fdef81474a923b5ea0e7fef901d0e4439b5c651
diff --git a/Android.bp b/Android.bp
index 87c0d8f..fe6d342 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,37 +22,21 @@
"proto/car_rotary_controller.proto",
],
}
-gensrcs {
+
+java_library {
name: "rotary-service-javastream-protos",
- depfile: true,
-
- tools: [
- "aprotoc",
- "protoc-gen-javastream",
- "soong_zip",
- ],
-
- cmd: "mkdir -p $(genDir)/$(in) " +
- "&& $(location aprotoc) " +
- " --plugin=$(location protoc-gen-javastream) " +
- " --dependency_out=$(depfile) " +
- " --javastream_out=$(genDir)/$(in) " +
- " -Iexternal/protobuf/src " +
- " -I . " +
- " $(in) " +
- "&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)",
-
- srcs: [
- ":rotary-service-proto-source",
- ],
- output_extension: "srcjar",
+ proto: {
+ type: "stream",
+ },
+ srcs: [":rotary-service-proto-source"],
+ installable: false,
+ platform_apis: true,
}
android_app {
name: "CarRotaryController",
srcs: [
"src/**/*.java",
- ":rotary-service-javastream-protos",
],
resource_dirs: ["res"],
@@ -80,6 +64,7 @@
],
static_libs: [
"car-ui-lib",
+ "rotary-service-javastream-protos",
],
product_variables: {
pdk: {
@@ -95,7 +80,6 @@
srcs: [
"src/**/*.java",
- ":rotary-service-javastream-protos",
],
resource_dirs: [
@@ -116,6 +100,7 @@
],
static_libs: [
"car-ui-lib",
+ "rotary-service-javastream-protos",
],
product_variables: {
pdk: {