diff options
| author | 2020-02-12 20:33:15 +0000 | |
|---|---|---|
| committer | 2020-02-12 20:33:15 +0000 | |
| commit | df9dbcc9b080c19e946d3de3accfa14eebe04a93 (patch) | |
| tree | 9ea7f80ba0ad6f72ac15597dd9d8550ef3837c32 | |
| parent | 5cf71d715e75abd93715c9e4f2182aa1b2d57c51 (diff) | |
| parent | 7484c6c83c1c242d955d2a46d09cd38410664768 (diff) | |
Merge "Build StrictJarFile for host."
| -rw-r--r-- | core/jni/Android.bp | 2 | ||||
| -rw-r--r-- | core/jni/LayoutlibLoader.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
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<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)}, |