Merge "Bind BitmapRegionDecoder JNI" into android12-hostruntime-dev

libs/hwui/Android.bp

diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index dff3581..fc416fb 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -346,6 +346,7 @@
         "jni/AnimatedImageDrawable.cpp",
         "jni/Bitmap.cpp",
         "jni/BitmapFactory.cpp",
+        "jni/BitmapRegionDecoder.cpp",
         "jni/ByteBufferStreamAdaptor.cpp",
         "jni/Camera.cpp",
         "jni/CanvasProperty.cpp",
@@ -411,7 +412,6 @@
         android: {
             srcs: [ // sources that depend on android only libraries
                 "jni/android_graphics_TextureLayer.cpp",
-                "jni/BitmapRegionDecoder.cpp",
                 "jni/GIFMovie.cpp",
                 "jni/GraphicsStatsService.cpp",
                 "jni/Movie.cpp",

libs/hwui/apex/RobolectricNativeRuntime.cpp

diff --git a/libs/hwui/apex/RobolectricNativeRuntime.cpp b/libs/hwui/apex/RobolectricNativeRuntime.cpp
index f6182e5..b7f16be 100644
--- a/libs/hwui/apex/RobolectricNativeRuntime.cpp
+++ b/libs/hwui/apex/RobolectricNativeRuntime.cpp
@@ -27,6 +27,7 @@
 using namespace std;
 
 int register_android_graphics_Bitmap(JNIEnv*);
+int register_android_graphics_BitmapRegionDecoder(JNIEnv*);
 int register_android_graphics_BitmapFactory(JNIEnv*);
 int register_android_graphics_ByteBufferStreamAdaptor(JNIEnv* env);
 int register_android_graphics_CreateJavaOutputStreamAdaptor(JNIEnv* env);
@@ -79,6 +80,7 @@
 static const RegJNIRec graphicsJNI[] = {
         REG_JNI(register_android_graphics_Bitmap),
         REG_JNI(register_android_graphics_BitmapFactory),
+        REG_JNI(register_android_graphics_BitmapRegionDecoder),
         REG_JNI(register_android_graphics_ByteBufferStreamAdaptor),
         REG_JNI(register_android_graphics_Canvas),
         REG_JNI(register_android_graphics_CanvasProperty),