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

Commit ccc88736 authored by Vova Sharaienko's avatar Vova Sharaienko Committed by Automerger Merge Worker
Browse files

Merge "[TeX] Removed JNI dependency" into main am: 0b50679b am: 175136b4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2542190



Change-Id: I6445344875fdf83b854cc7c444e596e129d9fdc6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73bdbeab 175136b4

core/jni/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -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: [

core/jni/AndroidRuntime.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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),