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

Commit ef7aeb21 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "[BP CLEANUP] Format bpfmt -s in android,tools"

parents 1c6ab980 e02ec316

android/app/tests/unit/Android.bp

+9 −9
Original line number Diff line number Diff line
@@ -9,27 +9,27 @@ java_defaults { 
    min_sdk_version: "Tiramisu",

    target_sdk_version: "current",

    libs: [

        "javax.obex",

        "android.test.runner",

        "telephony-common",

        "libprotobuf-java-micro",

        "android.test.base",

        "android.test.mock",

        "android.test.runner",

        "javax.obex",

        "libprotobuf-java-micro",

        "telephony-common",

    ],



    static_libs: [

        "PlatformProperties",

        "androidx.media_media",

        "androidx.test.ext.truth",

        "androidx.test.rules",

        "androidx.test.espresso.intents",

        "androidx.room_room-migration",

        "androidx.room_room-runtime",

        "androidx.room_room-testing",

        "androidx.test.espresso.intents",

        "androidx.test.ext.truth",

        "androidx.test.rules",

        "framework-bluetooth-pre-jarjar",

        "gson",

        "mockito-target",

        "truth-prebuilt",

        "PlatformProperties",

        "framework-bluetooth-pre-jarjar",

    ],



    asset_dirs: ["src/com/android/bluetooth/btservice/storage/schemas"],

android/leaudio/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ android_app { 
    manifest: "app/src/main/AndroidManifest.xml",



    static_libs: [

        "androidx.appcompat_appcompat",

        "androidx-constraintlayout_constraintlayout",

        "com.google.android.material_material",

        "androidx.appcompat_appcompat",

        "androidx.legacy_legacy-support-v4",

        "androidx.lifecycle_lifecycle-extensions",

        "com.google.android.material_material",

    ],



    privileged: true,

android/pandora/mmi2grpc/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ license { 
filegroup {

    name: "mmi2grpc",

    srcs: [

        "mmi2grpc/*.py",

        ":pandora-python-src",

        ":pandora_experimental-python-src",

        "mmi2grpc/*.py",

    ],

}

android/pandora/server/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -19,18 +19,18 @@ java_library_static { 
    ],



    static_libs: [

        "androidx.test.runner",

        "androidx.test.core",

        "androidx.test.runner",

        "androidx.test.uiautomator_uiautomator",

        "grpc-java-netty-shaded-test",

        "grpc-java-lite",

        "grpc-java-netty-shaded-test",

        "guava",

        "opencensus-java-api",

        "kotlin-test",

        "kotlinx_coroutines",

        "opencensus-java-api",

        "opencensus-java-contrib-grpc-metrics",

        "pandora_experimental-grpc-java",

        "pandora_experimental-proto-java",

        "opencensus-java-contrib-grpc-metrics",

    ],

}
@@ -59,8 +59,8 @@ android_test { 
    test_config: "configs/PtsBotTest.xml",

    data: [

        ":PandoraServer",

        "configs/pts_bot_tests_config.json",

        ":mmi2grpc",

        "configs/pts_bot_tests_config.json",

    ],

    test_suites: ["device-tests"],

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

    data: [

        ":PandoraServer",

        "configs/pts_bot_tests_config.json",

        ":mmi2grpc",

        "configs/pts_bot_tests_config.json",

    ],

    test_suites: ["mts-bluetooth"],

    min_sdk_version: "Tiramisu",

android/pandora/test/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ python_test_host { 
    name: "avatar",

    main: "main.py",

    srcs: [

        "main.py",

        "*_test.py",

        "example.py",

        "main.py",

    ],

    libs: [

        "libavatar",

        "bumble_services_experimental-python",

        "libavatar",

    ],

    required: [

        "aapt",