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

Commit 47f72049 authored by David Duarte's avatar David Duarte Committed by Gerrit Code Review
Browse files

Merge "Format build files with bpfmt"

parents 423dd861 6e204dfd

android/app/Android.bp

+6 −3
Original line number Diff line number Diff line
@@ -136,7 +136,10 @@ android_app { 
        "src/**/*.java",

        ":statslog-bluetooth-java-gen",

    ],

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

    aaptflags: [

        "--custom-package",

        "com.android.bluetooth",

    ],

    certificate: ":com.android.bluetooth.certificate",



    jarjar_rules: ":bluetooth-jarjar-rules",
@@ -217,7 +220,7 @@ android_app { 
java_library {

    name: "bluetooth.change-ids",

    srcs: [

        "src/com/android/bluetooth/ChangeIds.java"

        "src/com/android/bluetooth/ChangeIds.java",

    ],

    libs: [

        "app-compat-annotations",
@@ -261,5 +264,5 @@ genrule { 


android_app_certificate {

    name: "com.android.bluetooth.certificate",

    certificate: "certs/com.android.bluetooth"

    certificate: "certs/com.android.bluetooth",

}

android/pandora/server/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ android_test { 
    test_config: "configs/PtsBotTest.xml",

    data: [

        "configs/pts_bot_tests_config.json",

        ":mmi2grpc"

        ":mmi2grpc",

    ],

    test_suites: ["device-tests"],

    min_sdk_version: "Tiramisu",
@@ -71,7 +71,7 @@ android_test { 
    test_config: "configs/PtsBotTestMts.xml",

    data: [

        "configs/pts_bot_tests_config.json",

        ":mmi2grpc"

        ":mmi2grpc",

    ],

    test_suites: ["mts-bluetooth"],

    min_sdk_version: "Tiramisu",

android/pandora/test/Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ python_test_host { 
        "libavatar",

        "bumble_services_experimental-python",

    ],

    required: ["PandoraServer", "aapt"],

    required: [

        "PandoraServer",

        "aapt",

    ],

    test_suites: ["general-tests"],

    test_options: {

        unit_test: false,
@@ -45,5 +48,5 @@ sh_binary_host { 
        "pandora_experimental-python-gen-src",

        "tradefed",

        "tradefed-test-framework",

    ]

    ],

}

framework/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ java_sdk_library { 
    jarjar_rules: ":bluetooth-jarjar-rules",

    installable: true,

    optimize: {

        enabled: false

        enabled: false,

    },

    hostdex: true, // for hiddenapi check
@@ -122,8 +122,7 @@ java_api_contribution { 
    ],

}



platform_compat_config

{

platform_compat_config {

    name: "framework-bluetooth-compat-config",

    src: ":framework-bluetooth",

}

pandora/interfaces/python/Android.bp

+14 −14
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ genrule { 
    name: "pandora_experimental-python-gen-src",

    tools: [

        "aprotoc",

        "protoc-gen-pandora-python"

        "protoc-gen-pandora-python",

    ],

    cmd: "$(location aprotoc)" +

        "    -Ipackages/modules/Bluetooth/pandora/interfaces" +
@@ -70,17 +70,17 @@ genrule { 
        "pandora_experimental/rfcomm_grpc_aio.py",

        "pandora_experimental/rfcomm_pb2.py",

        "pandora_experimental/rfcomm_pb2.pyi",

    ]

    ],

}



filegroup {

    name: "pandora_experimental-python-src",

    srcs: [

        ":pandora_experimental-python-gen-src"

        ":pandora_experimental-python-gen-src",

    ],

    exclude_srcs: [

        ":pandora_experimental-python-stubs",

    ]

    ],

}



filegroup {
@@ -107,5 +107,5 @@ python_library_host { 
    libs: ["pandora-python"],

    data: [

        ":pandora_experimental-python-stubs",

    ]

    ],

}