Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ab64c52 authored by Vinh Tran's avatar Vinh Tran Committed by Automerger Merge Worker
Browse files

Convert gensrcs to java_library to deprecate depfile am: 0d62f886 am: c5918bff 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18930290



Change-Id: If4ca7aac3e89aef4b7d48dcc4b858fb7439f5e52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef48d3b8 c5918bff

android/app/Android.bp

+11 −21
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ android_app { 
    srcs: [

        "src/**/*.java",

        ":statslog-bluetooth-java-gen",

        ":bluetooth-proto-enums-java-gen",

    ],

    aaptflags: [ "--custom-package", "com.android.bluetooth" ],

    certificate: ":com.android.bluetooth.services.certificate",
@@ -132,6 +131,7 @@ android_app { 
        "net-utils-services-common",

        "networkstack-client",

        "PlatformProperties",

        "bluetooth-proto-enums-java-gen",

    ],



    plugins: [
@@ -166,30 +166,20 @@ android_app { 
    sdk_version: "module_current",

}



gensrcs {

java_library {

    name: "bluetooth-proto-enums-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)",



    installable: false,

    proto: {

        type: "stream",

    },

    srcs: [

        ":srcs_bluetooth_protos",

    ],

    output_extension: "srcjar",

    apex_available: [

        "com.android.bluetooth",

    ],

    min_sdk_version: "Tiramisu",

    sdk_version: "module_current",

}



genrule {

service/Android.bp

+15 −22
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ java_library { 
    defaults: ["service-bluetooth-common-defaults"],

    srcs: [

        ":services.bluetooth-sources",

        ":bluetooth-proto-enums-java-gen",

        ":bluetooth-manager-service-proto-java-gen",

    ],

    // java_api_finder must accompany `srcs`

    plugins: ["java_api_finder"],
@@ -68,6 +66,8 @@ java_library { 
        "androidx.annotation_annotation",

        "androidx.appcompat_appcompat",

        "modules-utils-shell-command-handler",

        "bluetooth-manager-service-proto-java-gen",

        "bluetooth-proto-enums-java-gen",

    ],



    apex_available: [
@@ -109,28 +109,21 @@ java_library { 
    min_sdk_version: "Tiramisu"

}



gensrcs {

java_library {

    name: "bluetooth-manager-service-proto-java-gen",

    depfile: true,



    tools: [

        "aprotoc",

        "protoc-gen-javastream",

        "soong_zip",

    installable: false,

    proto: {

        type: "stream",

        include_dirs: [

             "external/protobuf/src",

        ],



    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: [

        ":srcs_bluetooth_manager_service_proto",

    ],

    output_extension: "srcjar",

    sdk_version: "system_server_current",

    apex_available: [

        "com.android.bluetooth",

    ],

    min_sdk_version: "Tiramisu"

}