commit c5882c4eb614179c8dad323cbbb115b62bb35f43
author Derek Sollenberger <djsollen@google.com> Fri Oct 25 11:11:32 2019 -0400
committer Derek Sollenberger <djsollen@google.com> Thu Feb 20 21:49:44 2020 -0500
tree 95aa6014369da64fa5a6911df001046c002fd51e
parent 5368eda5127701dc84b9e4da61dfbfa685a00b2d

Remove dependencies on headers outside UI module

This includes AndroidRuntime and core_jni_helper.h

Bug: 137655431
Test: CtsUiRenderingTestCases
Change-Id: If3d26f41eaf4981505ee47634097f3645fd563fd

libs/hwui/apex/jni_runtime.cpp

diff --git a/libs/hwui/apex/jni_runtime.cpp b/libs/hwui/apex/jni_runtime.cpp
index c674f93..a114e2f 100644
--- a/libs/hwui/apex/jni_runtime.cpp
+++ b/libs/hwui/apex/jni_runtime.cpp
@@ -21,6 +21,7 @@
 #include <sys/cdefs.h>
 
 #include <EGL/egl.h>
+#include <GraphicsJNI.h>
 #include <Properties.h>
 #include <SkGraphics.h>
 
@@ -150,6 +151,10 @@
 }
 
 int register_android_graphics_classes(JNIEnv *env) {
+    JavaVM* vm = nullptr;
+    env->GetJavaVM(&vm);
+    GraphicsJNI::setJavaVM(vm);
+
     for (size_t i = 0; i < NELEM(android::gRegJNI); i++) {
         if (android::gRegJNI[i].mProc(env) < 0) {
 #ifndef NDEBUG