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

Commit b5cfa4e6 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Link to expressLog and load jni lib" into main am: d2429f6b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2842653



Change-Id: Ife8d64dcb437eba59583aa2caeb766d50871a862
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbd8d03a d2429f6b

android/app/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ cc_library_shared { 
        "libchrome",

        "libcutils",

        "libevent",

        "libexpresslog_jni",

        "libflatbuffers-cpp",

        "libfmq",

        "libg722codec",
@@ -134,6 +135,7 @@ cc_library_shared { 
        "libosi",

        "libprotobuf-cpp-lite",

        "libstatslog_bt",

        "libtextclassifier_hash_static",

        "libudrv-uipc",

        "libutils",

        "server_configurable_flags",

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+10 −0
Original line number Diff line number Diff line
@@ -2218,6 +2218,9 @@ int register_com_android_bluetooth_btservice_AdapterService(JNIEnv* env) { 
  return 0;

}



extern int register_com_android_modules_expresslog_Utils(

    JNIEnv* env, const char* const kUtilsClassName);



} /* namespace android */



/*
@@ -2352,6 +2355,13 @@ jint JNI_OnLoad(JavaVM* jvm, void* /* reserved */) { 
    return JNI_ERR;

  }



  status = android::register_com_android_modules_expresslog_Utils(

      e, "com/android/bluetooth/x/com/android/modules/expresslog/Utils");

  if (status < 0) {

    ALOGE("jni expresslog utils failure: %d", status);

    return JNI_ERR;

  }



  return JNI_VERSION_1_6;

}