From 7484c6c83c1c242d955d2a46d09cd38410664768 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Wed, 12 Feb 2020 11:01:52 -0800 Subject: Build StrictJarFile for host. (cherry pick from I6c85c3b1e3d02c480a11ef3a3ba3df82ec01553c) Bug: 138449617 Test: m libandroid_runtime Change-Id: I969801d431e985d8f33ff5cb76ba67571cc6c8c9 --- core/jni/Android.bp | 2 +- core/jni/LayoutlibLoader.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 8959d6fb845e..e57001b0f3d1 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -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", diff --git a/core/jni/LayoutlibLoader.cpp b/core/jni/LayoutlibLoader.cpp index c49c3a0f6b61..7ceef984898d 100644 --- a/core/jni/LayoutlibLoader.cpp +++ b/core/jni/LayoutlibLoader.cpp @@ -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 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)}, -- cgit v1.2.3-59-g8ed1b