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

Commit c65c05bb authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8414339 from a3307956 to tm-qpr1-release 

Change-Id: I7da3c052ead3f7627841142ee27a511367b23775
parents 0be69f73 a3307956

android/app/Android.bp

+23 −12
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ java_library { 
    name: "bluetooth.mapsapi",



    srcs: ["lib/mapapi/**/*.java"],

    min_sdk_version: "current",

    apex_available: [

        "com.android.bluetooth",

    ],

    min_sdk_version: "Tiramisu",

    sdk_version: "module_current",

}
@@ -44,7 +47,7 @@ java_library { 
    apex_available: [

        "com.android.bluetooth",

    ],

    min_sdk_version: "current",

    min_sdk_version: "Tiramisu",

    sdk_version: "module_current",

}
@@ -52,6 +55,7 @@ java_library { 


cc_library_shared {

    name: "libbluetooth_jni",

    defaults: ["fluoride_full_defaults"],

    srcs: ["jni/**/*.cpp"],

    header_libs: [

        "jni_headers",
@@ -60,14 +64,9 @@ cc_library_shared { 
    include_dirs: [

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

    ],

    shared_libs: [

        "libbase",

        "libchrome",

        "liblog",

        "libnativehelper",

    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth",

    ],

    cflags: [

        "-Wall",
@@ -81,7 +80,7 @@ cc_library_shared { 
    apex_available: [

        "com.android.bluetooth",

    ],

    min_sdk_version: "current",

    min_sdk_version: "Tiramisu",

}



// Bluetooth APK
@@ -97,7 +96,7 @@ android_app { 
    ],

    platform_apis: false,

    certificate: "platform",



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

    jarjar_rules: ":bluetooth-jarjar-rules",



    jni_uses_platform_apis: true,
@@ -145,7 +144,19 @@ android_app { 
    optimize: {

        enabled: false,

    },

    required: ["libbluetooth"],

    required: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

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

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

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

        "audio_set_configurations_bfbs",

        "audio_set_configurations_json",

        "audio_set_scenarios_bfbs",

        "audio_set_scenarios_json",

        "bt_did.conf",

        "bt_stack.conf",

    ],

    apex_available: [

        "com.android.bluetooth",

    ],
@@ -154,7 +165,7 @@ android_app { 
            // "-Xep:AndroidFrameworkRequiresPermission:ERROR",

        ],

    },

    min_sdk_version: "current",

    min_sdk_version: "Tiramisu",

    sdk_version: "module_current",

}

android/app/AndroidManifest.xml

+328 −268

File changed.

Preview size limit exceeded, changes collapsed.

android/app/jni/com_android_bluetooth_a2dp.cpp

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


#define LOG_TAG "BluetoothA2dpServiceJni"



#define LOG_NDEBUG 0



#include "com_android_bluetooth.h"

#include "hardware/bt_av.h"

#include "utils/Log.h"

android/app/jni/com_android_bluetooth_a2dp_sink.cpp

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


#define LOG_TAG "BluetoothA2dpSinkServiceJni"



#define LOG_NDEBUG 0



#include "com_android_bluetooth.h"

#include "hardware/bt_av.h"

#include "utils/Log.h"

android/app/jni/com_android_bluetooth_avrcp_controller.cpp

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


#define LOG_TAG "BluetoothAvrcpControllerJni"



#define LOG_NDEBUG 0



#include "com_android_bluetooth.h"

#include "hardware/bt_rc.h"

#include "utils/Log.h"