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

Commit 8af03f01 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4407698 from 66e0a4a7 to pi-release 

Change-Id: Ib54475e12edbcf556305990237867fa2b6d2b894
parents e1ef06a3 66e0a4a7

android/app/.clang-format

+2 −5
Original line number Diff line number Diff line
@@ -25,8 +25,5 @@ DerivePointerAlignment: false 


---

Language: Java

BasedOnStyle: Google

IndentWidth: 4

ContinuationIndentWidth: 8

ColumnLimit: 100

AllowShortIfStatementsOnASingleLine: true
 
# Java format is handled by check_style hook

DisableFormat: true

android/app/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
        android-support-v4

LOCAL_PROTOC_OPTIMIZE_TYPE := micro



LOCAL_REQUIRED_MODULES := bluetooth.default

LOCAL_REQUIRED_MODULES := libbluetooth



LOCAL_PROGUARD_ENABLED := disabled

android/app/PREUPLOAD.cfg

+5 −0
Original line number Diff line number Diff line
@@ -4,3 +4,8 @@ ignore_merged_commits = true 
[Builtin Hooks]

clang_format = true



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

                  -fw src/com/android/bluetooth/

                      lib/mapapi/com/android/bluetooth/mapapi/

                      tests/src/com/android/bluetooth/

android/app/jni/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ cc_library_shared { 
        "com_android_bluetooth_gatt.cpp",

        "com_android_bluetooth_sdp.cpp",

    ],

    header_libs: ["libbluetooth_headers"],

    include_dirs: [

        "libnativehelper/include/nativehelper",

        "system/bt/types",
@@ -24,7 +25,6 @@ cc_library_shared { 
        "libchrome",

        "libnativehelper",

        "liblog",

        "libhardware",

    ],

    static_libs: [

        "libbluetooth-types",

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+3 −7
Original line number Diff line number Diff line
@@ -587,11 +587,7 @@ static bt_os_callouts_t sBluetoothOsCallouts = { 
    acquire_wake_lock_callout, release_wake_lock_callout,

};



#if defined(__LP64__)

#define BLUETOOTH_LIBRARY_NAME "/system/lib64/hw/bluetooth.default.so"

#else

#define BLUETOOTH_LIBRARY_NAME "/system/lib/hw/bluetooth.default.so"

#endif

#define BLUETOOTH_LIBRARY_NAME "libbluetooth.so"



int hal_util_load_bt_library(const bt_interface_t** interface) {

  const char* sym = BLUETOOTH_INTERFACE_STRING;
@@ -602,8 +598,8 @@ int hal_util_load_bt_library(const bt_interface_t** interface) { 
  void* handle = dlopen(path, RTLD_NOW);

  if (!handle) {

    const char* err_str = dlerror();

    LOG(ERROR) << __func__ << ": failed to load Bluetooth library " << path

               << ", error=" << (err_str ? err_str : "error unknown");

    LOG(ERROR) << __func__ << ": failed to load Bluetooth library, error="

               << (err_str ? err_str : "error unknown");

    goto error;

  }