summaryrefslogtreecommitdiff
path: root/service/Android.bp
diff options
context:
space:
mode:
authorVinh Tran <vinhdaitran@google.com>2022-06-07 18:06:51 -0400
committerShriya Gupta <shrigupt@google.com>2022-07-06 15:05:42 +0000
commit7610e8a3bd54c02e0d47c81a4936f5330f9e35a6 (patch)
tree7182674f3731f424e7d9439d0222b643067b9fc5 /service/Android.bp
parent95352386432acb2a5d5beb929db23e40a5e13980 (diff)
downloadPermission-7610e8a3bd54c02e0d47c81a4936f5330f9e35a6.tar.gz
Replace gensrcs with java_library to deprecate depfile in gensrcs
The depfile concept in Soong and Ninja isn't applicable in Bazel because Bazel requires listing the deps explicitly. This CL changes the module type from gensrcs to java_library with proto.type set to "stream". The end goal is to eventually deprecate depfile in gensrcs to ensure all gensrcs modules are convertable to Bazel. Test: CI Bug: 179452413 Change-Id: Icd588b33749a423ed2518d4c3a51909e962f36e0 (cherry picked from commit 8152d924f750d5b974199d5b15f9f57a3ebcbac8)
Diffstat (limited to 'service/Android.bp')
-rw-r--r--service/Android.bp38
1 files changed, 15 insertions, 23 deletions
diff --git a/service/Android.bp b/service/Android.bp
index 87914f709..5cc31f03f 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -35,30 +35,22 @@ filegroup {
visibility: ["//frameworks/base"],
}
-gensrcs {
+java_library {
name: "service-permission-streaming-proto-java-gen",
- 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: [
- ":service-permission-streaming-proto-sources",
+ proto: {
+ type: "stream",
+ include_dirs: [
+ "external/protobuf/src",
+ ],
+ },
+ srcs: [":service-permission-streaming-proto-sources"],
+ installable: false,
+ min_sdk_version: "30",
+ sdk_version: "system_server_current",
+ apex_available: [
+ "com.android.permission",
+ "test_com.android.permission",
],
- output_extension: "srcjar",
}
java_library {
@@ -91,7 +83,6 @@ java_sdk_library {
],
srcs: [
":service-permission-java-sources",
- ":service-permission-streaming-proto-java-gen",
],
libs: [
"androidx.annotation_annotation",
@@ -117,6 +108,7 @@ java_sdk_library {
"safety-center-persistence",
"safety-center-resources-lib",
"service-permission-shared",
+ "service-permission-streaming-proto-java-gen",
],
exclude_kotlinc_generated_files: true,
jarjar_rules: ":permission-jarjar-rules",