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

Commit df9dbcc9 authored by Brett Chabot's avatar Brett Chabot Committed by Android (Google) Code Review
Browse files

Merge "Build StrictJarFile for host."

parents 5cf71d71 7484c6c8

core/jni/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ cc_library_shared { 
        "android_util_Log.cpp",

        "android_util_StringBlock.cpp",

        "android_util_XmlBlock.cpp",

        "android_util_jar_StrictJarFile.cpp",

        "android_view_RenderNodeAnimator.cpp",

        "com_android_internal_util_VirtualRefBasePtr.cpp",

        "com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp",
@@ -152,7 +153,6 @@ cc_library_shared { 
                "android_util_Binder.cpp",

                "android_util_MemoryIntArray.cpp",

                "android_util_Process.cpp",

                "android_util_jar_StrictJarFile.cpp",

                "android_media_AudioDevice.cpp",

                "android_media_AudioEffectDescriptor.cpp",

                "android_media_AudioRecord.cpp",

core/jni/LayoutlibLoader.cpp

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ extern int register_android_text_AndroidCharacter(JNIEnv* env); 
extern int register_android_util_EventLog(JNIEnv* env);

extern int register_android_util_Log(JNIEnv* env);

extern int register_android_util_PathParser(JNIEnv* env);

extern int register_android_util_jar_StrictJarFile(JNIEnv* env);

extern int register_android_view_RenderNode(JNIEnv* env);

extern int register_android_view_RenderNodeAnimator(JNIEnv* env);

extern int register_android_view_DisplayListCanvas(JNIEnv* env);
@@ -149,6 +150,7 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = { 
        {"android.util.EventLog", REG_JNI(register_android_util_EventLog)},

        {"android.util.Log", REG_JNI(register_android_util_Log)},

        {"android.util.PathParser", REG_JNI(register_android_util_PathParser)},

        {"android.util.jar.StrictJarFile", REG_JNI(register_android_util_jar_StrictJarFile)},

        {"android.view.RenderNodeAnimator", REG_JNI(register_android_view_RenderNodeAnimator)},

        {"com.android.internal.util.VirtualRefBasePtr",

         REG_JNI(register_com_android_internal_util_VirtualRefBasePtr)},