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

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

Merge changes Ia61c0e2d,I30802a51,Iff2afd21 

* changes:
  Remove libPlatformProperties from fluoride_basic_defaults
  Remove libaaudio from fluoride_basic_defaults
  Remove libbluetooth_jni dependencies in fluoride_basic_defaults
parents 64f6c46f 02a06abb

android/app/Android.bp

+15 −0
Original line number Original line Diff line number Diff line
@@ -67,11 +67,14 @@ cc_library_shared { 
        "packages/modules/Bluetooth/system/types",

        "packages/modules/Bluetooth/system/types",

    ],

    ],

    static_libs: [

    static_libs: [

        "android.system.suspend.control-V1-ndk",

        "avrcp-target-service",

        "avrcp-target-service",

        "lib-bt-packets-avrcp",

        "lib-bt-packets-avrcp",

        "lib-bt-packets-base",

        "lib-bt-packets-base",

        "libFraunhoferAAC",

        "libaudio-a2dp-hw-utils",

        "libaudio-a2dp-hw-utils",

        "libbluetooth",

        "libbluetooth",

        "libbluetooth-dumpsys",

        "libbluetooth-types",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",

        "libbluetooth_core_rs_bridge",
@@ -80,6 +83,8 @@ cc_library_shared { 
        "libbt-bta-core",

        "libbt-bta-core",

        "libbt-common",

        "libbt-common",

        "libbt-hci",

        "libbt-hci",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libbt-stack",

        "libbt-stack",

        "libbt-stack-core",

        "libbt-stack-core",

        "libbtcore",

        "libbtcore",
@@ -90,13 +95,23 @@ cc_library_shared { 
        "libc++fs",

        "libc++fs",

        "libchrome",

        "libchrome",

        "libevent",

        "libevent",

        "libg722codec",

        "liblc3",

        "libmodpb64",

        "libmodpb64",

        "libopus",

        "libosi",

        "libosi",

        "libudrv-uipc",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "android.hardware.bluetooth.audio-V3-ndk",

        "android.hardware.bluetooth.audio-V3-ndk",

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.hardware.bluetooth@1.1",

        "android.system.suspend-V1-ndk",

        "libaaudio",

        "libbinder_ndk",

        "libfmq",

        "libnativehelper",

    ],

    ],

    sanitize: {

    sanitize: {

        scs: true,

        scs: true,

system/btif/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -136,6 +136,7 @@ cc_library_static { 
                "libPlatformProperties",

                "libPlatformProperties",

            ],

            ],

            srcs: ["src/btif_avrcp_audio_track.cc"],

            srcs: ["src/btif_avrcp_audio_track.cc"],

            shared_libs: ["libaaudio"],

        },

        },

        host: {

        host: {

            srcs: [

            srcs: [
@@ -210,6 +211,7 @@ cc_library_static { 
    target: {

    target: {

        android: {

        android: {

            srcs: ["src/btif_avrcp_audio_track.cc"],

            srcs: ["src/btif_avrcp_audio_track.cc"],

            shared_libs: ["libaaudio"],

        },

        },

        host: {

        host: {

            srcs: [

            srcs: [

system/build/Android.bp

+0 −24
Original line number Original line Diff line number Diff line
@@ -114,40 +114,16 @@ cc_defaults { 
        "com.android.btservices",

        "com.android.btservices",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

        "android.hardware.bluetooth.audio@2.1",

        "libbase",

        "libbase",

        "libbinder_ndk",

        "libcrypto",

        "libcrypto",

        "libfmq",

        "libnativehelper",

    ],

    ],

    static_libs: [

    static_libs: [

        "android.hardware.bluetooth.a2dp@1.0",

        "android.hardware.bluetooth.a2dp@1.0",

        "libFraunhoferAAC",

        "libbluetooth-dumpsys",

        "libbt-protos-lite",

        "libbt-protos-lite",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libflatbuffers-cpp",

        "libflatbuffers-cpp",

        "libg722codec",

        "liblc3",

        "libopus",

        "libprotobuf-cpp-lite",

        "libprotobuf-cpp-lite",

        "libudrv-uipc",

    ],

    ],

    target: {

        android: {

            shared_libs: [

                "android.system.suspend-V1-ndk",

                "libPlatformProperties",

                "libaaudio",

            ],

            static_libs: [

                "android.system.suspend.control-V1-ndk",

            ],

        },

    },

}

}





cc_defaults {

cc_defaults {

system/stack/Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -285,6 +285,9 @@ cc_library_static { 
        "libbluetooth_core_rs",

        "libbluetooth_core_rs",

        "libbt-hci",

        "libbt-hci",

    ],

    ],

    shared_libs: [

        "libPlatformProperties",

    ],

    host_supported: true,

    host_supported: true,

    min_sdk_version: "Tiramisu",

    min_sdk_version: "Tiramisu",

}

}