diff options
| author | 2023-12-13 19:08:20 +0000 | |
|---|---|---|
| committer | 2023-12-13 19:08:20 +0000 | |
| commit | 175136b4cac993c11fbee766bd5e17d51fab287e (patch) | |
| tree | 27c0d569b19894269dc0a432f5fff4ae3efe46f0 | |
| parent | 12caa8bfba96bf0bc4639555f02f9c64b86c5530 (diff) | |
| parent | 0b50679bdf82dc0bf69a91cdcab2814ca0383aaa (diff) | |
Merge "[TeX] Removed JNI dependency" into main am: 0b50679bdf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2542190
Change-Id: I04d909f8a6decf2fa17ac6e4c04a9a4387c94303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/jni/Android.bp | 5 | ||||
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 05117ce5fbff..f5b12db97c54 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -46,8 +46,6 @@ cc_library_shared_for_libandroid_runtime { "-Wno-error=deprecated-declarations", "-Wunused", "-Wunreachable-code", - - "-DNAMESPACE_FOR_HASH_FUNCTIONS=farmhash", ], cppflags: ["-Wno-conversion-null"], @@ -278,8 +276,6 @@ cc_library_shared_for_libandroid_runtime { "libscrypt_static", "libstatssocket_lazy", "libskia", - "libtextclassifier_hash_static", - "libexpresslog_jni", ], shared_libs: [ @@ -366,7 +362,6 @@ cc_library_shared_for_libandroid_runtime { "bionic_libc_platform_headers", "dnsproxyd_protocol_headers", "flatbuffer_headers", - "libtextclassifier_hash_headers", "tensorflow_headers", ], runtime_libs: [ diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index b2131f6fdfad..4e4c7541a32e 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -200,7 +200,6 @@ extern int register_com_android_internal_content_F2fsUtils(JNIEnv* env); extern int register_com_android_internal_content_NativeLibraryHelper(JNIEnv *env); extern int register_com_android_internal_content_om_OverlayConfig(JNIEnv *env); extern int register_com_android_internal_content_om_OverlayManagerImpl(JNIEnv* env); -extern int register_com_android_modules_expresslog_Utils(JNIEnv* env); extern int register_com_android_internal_net_NetworkUtilsInternal(JNIEnv* env); extern int register_com_android_internal_os_ClassLoaderFactory(JNIEnv* env); extern int register_com_android_internal_os_FuseAppLoop(JNIEnv* env); @@ -1588,7 +1587,6 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_os_incremental_IncrementalManager), REG_JNI(register_com_android_internal_content_om_OverlayConfig), REG_JNI(register_com_android_internal_content_om_OverlayManagerImpl), - REG_JNI(register_com_android_modules_expresslog_Utils), REG_JNI(register_com_android_internal_net_NetworkUtilsInternal), REG_JNI(register_com_android_internal_os_ClassLoaderFactory), REG_JNI(register_com_android_internal_os_LongArrayMultiStateCounter), |