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

Commit 5edb85c1 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "add sound trigger JNI"

parents 7de8c849 60b62bc5

core/jni/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ LOCAL_SRC_FILES:= \ 
	android_hardware_camera2_DngCreator.cpp \

	android_hardware_SensorManager.cpp \

	android_hardware_SerialPort.cpp \

	android_hardware_SoundTrigger.cpp \

	android_hardware_UsbDevice.cpp \

	android_hardware_UsbDeviceConnection.cpp \

	android_hardware_UsbRequest.cpp \
@@ -235,6 +236,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libpdfium \

	libimg_utils \

	libnetd_client \

	libsoundtrigger



ifeq ($(USE_OPENGL_RENDERER),true)

	LOCAL_SHARED_LIBRARIES += libhwui

core/jni/AndroidRuntime.cpp

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ extern int register_android_hardware_camera2_legacy_LegacyCameraDevice(JNIEnv *e 
extern int register_android_hardware_camera2_DngCreator(JNIEnv *env);

extern int register_android_hardware_SensorManager(JNIEnv *env);

extern int register_android_hardware_SerialPort(JNIEnv *env);

extern int register_android_hardware_SoundTrigger(JNIEnv *env);

extern int register_android_hardware_UsbDevice(JNIEnv *env);

extern int register_android_hardware_UsbDeviceConnection(JNIEnv *env);

extern int register_android_hardware_UsbRequest(JNIEnv *env);
@@ -1282,6 +1283,7 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_hardware_camera2_DngCreator),

    REG_JNI(register_android_hardware_SensorManager),

    REG_JNI(register_android_hardware_SerialPort),

    REG_JNI(register_android_hardware_SoundTrigger),

    REG_JNI(register_android_hardware_UsbDevice),

    REG_JNI(register_android_hardware_UsbDeviceConnection),

    REG_JNI(register_android_hardware_UsbRequest),

core/jni/android_hardware_SoundTrigger.cpp

0 → 100644
+661 −0

File added.

Preview size limit exceeded, changes collapsed.