Merge "Link to expressLog and load jni lib" into main (d2429f6b) · Commits · e / os / android_packages_modules_Bluetooth

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",

+10 −0

Original line number	Diff line number	Diff line
		@@ -2217,6 +2217,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 */

		/*
		@@ -2351,6 +2354,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;
		}