diff options
| author | Vinh Tran <vinhdaitran@google.com> | 2022-06-08 04:38:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-08 04:38:43 +0000 |
| commit | a56b27d2c1be6830e43e3e311cf6725130dcb8e3 (patch) | |
| tree | 8103f2a8ce1e868db939849e83561441681809c8 /service/Android.bp | |
| parent | 8933c067660935ef9b1180f69ee70e2b0e602c4c (diff) | |
| parent | fe8d695bf4f5731ff8e243482774f4e61c880155 (diff) | |
| download | Permission-a56b27d2c1be6830e43e3e311cf6725130dcb8e3.tar.gz | |
Merge "Replace gensrcs with java_library to deprecate depfile in gensrcs" into tm-dev-plus-aosp am: cb73c85459 am: 9886624661 am: fe8d695bf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/18774515
Change-Id: I353272256fc371cad5927e15508cfa1615ee44e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'service/Android.bp')
| -rw-r--r-- | service/Android.bp | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/service/Android.bp b/service/Android.bp index aa9ee6d74..56f024239 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -34,30 +34,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 { @@ -90,7 +82,6 @@ java_sdk_library { ], srcs: [ ":service-permission-java-sources", - ":service-permission-streaming-proto-java-gen", ], libs: [ "androidx.annotation_annotation", @@ -113,6 +104,7 @@ java_sdk_library { "safety-center-internal-data", "safety-center-resources-lib", "service-permission-shared", + "service-permission-streaming-proto-java-gen", ], exclude_kotlinc_generated_files: true, jarjar_rules: ":permission-jarjar-rules", |