diff options
| author | Daniel Norman <danielnorman@google.com> | 2020-08-31 12:05:49 -0700 |
|---|---|---|
| committer | Bill Peckham <bpeckham@google.com> | 2020-09-09 10:21:03 -0700 |
| commit | 8abdf0e95a5d15a310b6df69d33a4510a0b44b4a (patch) | |
| tree | f0c990be5370711e157b2e9e5ae746cb1af915b9 /core/jni/AndroidRuntime.cpp | |
| parent | 93e6c963c3228074d0e0dd5f3f8d057d9bd11e05 (diff) | |
| parent | 6997558ebbaa0c3e5708246807239f11e70ad35d (diff) | |
Merge SP1A.200727.001
Change-Id: Ibb86a528ed692cde325705779c7fa57e4b4de682
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 386f504292e5..92e272f52daa 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -73,9 +73,8 @@ extern int register_android_opengl_jni_GLES32(JNIEnv* env); extern int register_android_hardware_Camera(JNIEnv *env); extern int register_android_hardware_camera2_CameraMetadata(JNIEnv *env); -extern int register_android_hardware_camera2_legacy_LegacyCameraDevice(JNIEnv *env); -extern int register_android_hardware_camera2_legacy_PerfMeasurement(JNIEnv *env); extern int register_android_hardware_camera2_DngCreator(JNIEnv *env); +extern int register_android_hardware_camera2_utils_SurfaceUtils(JNIEnv* env); extern int register_android_hardware_display_DisplayManagerGlobal(JNIEnv* env); extern int register_android_hardware_HardwareBuffer(JNIEnv *env); extern int register_android_hardware_SensorManager(JNIEnv *env); @@ -1529,9 +1528,8 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_com_android_internal_util_VirtualRefBasePtr), REG_JNI(register_android_hardware_Camera), REG_JNI(register_android_hardware_camera2_CameraMetadata), - REG_JNI(register_android_hardware_camera2_legacy_LegacyCameraDevice), - REG_JNI(register_android_hardware_camera2_legacy_PerfMeasurement), REG_JNI(register_android_hardware_camera2_DngCreator), + REG_JNI(register_android_hardware_camera2_utils_SurfaceUtils), REG_JNI(register_android_hardware_display_DisplayManagerGlobal), REG_JNI(register_android_hardware_HardwareBuffer), REG_JNI(register_android_hardware_SensorManager), |