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

Commit a6b3933a authored by Vova Sharaienko's avatar Vova Sharaienko Committed by Android (Google) Code Review
Browse files

Merge "[TeX] Removed JNI dependency" into udc-mainline-prod

parents c3600fdc 1cb9cd73

core/jni/Android.bp

+0 −5
Original line number Original line Diff line number Diff line
@@ -34,8 +34,6 @@ cc_library_shared { 
        "-Wno-error=deprecated-declarations",

        "-Wno-error=deprecated-declarations",

        "-Wunused",

        "-Wunused",

        "-Wunreachable-code",

        "-Wunreachable-code",



        "-DNAMESPACE_FOR_HASH_FUNCTIONS=farmhash",

    ],

    ],





    cppflags: ["-Wno-conversion-null"],

    cppflags: ["-Wno-conversion-null"],
@@ -260,8 +258,6 @@ cc_library_shared { 
                "libscrypt_static",

                "libscrypt_static",

                "libstatssocket_lazy",

                "libstatssocket_lazy",

                "libskia",

                "libskia",

                "libtextclassifier_hash_static",

                "libexpresslog_jni",

            ],

            ],





            shared_libs: [

            shared_libs: [
@@ -348,7 +344,6 @@ cc_library_shared { 
                "bionic_libc_platform_headers",

                "bionic_libc_platform_headers",

                "dnsproxyd_protocol_headers",

                "dnsproxyd_protocol_headers",

                "flatbuffer_headers",

                "flatbuffer_headers",

                "libtextclassifier_hash_headers",

                "tensorflow_headers",

                "tensorflow_headers",

            ],

            ],

            runtime_libs: [

            runtime_libs: [

core/jni/AndroidRuntime.cpp

+0 −2
Original line number Original line 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_NativeLibraryHelper(JNIEnv *env);

extern int register_com_android_internal_content_om_OverlayConfig(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_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_net_NetworkUtilsInternal(JNIEnv* env);

extern int register_com_android_internal_os_ClassLoaderFactory(JNIEnv* env);

extern int register_com_android_internal_os_ClassLoaderFactory(JNIEnv* env);

extern int register_com_android_internal_os_FuseAppLoop(JNIEnv* env);

extern int register_com_android_internal_os_FuseAppLoop(JNIEnv* env);
@@ -1579,7 +1578,6 @@ static const RegJNIRec gRegJNI[] = { 
        REG_JNI(register_android_os_incremental_IncrementalManager),

        REG_JNI(register_android_os_incremental_IncrementalManager),

        REG_JNI(register_com_android_internal_content_om_OverlayConfig),

        REG_JNI(register_com_android_internal_content_om_OverlayConfig),

        REG_JNI(register_com_android_internal_content_om_OverlayManagerImpl),

        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_net_NetworkUtilsInternal),

        REG_JNI(register_com_android_internal_os_ClassLoaderFactory),

        REG_JNI(register_com_android_internal_os_ClassLoaderFactory),

        REG_JNI(register_com_android_internal_os_LongArrayMultiStateCounter),

        REG_JNI(register_com_android_internal_os_LongArrayMultiStateCounter),