1 files changed, 10 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index a715c5f..9acdab4 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -1034,6 +1034,16 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options
         setenv("ANDROID_ROOT", rootDir, 1);
     }
 
+    const char* prebundledDir = getenv("PREBUNDLED_ROOT");
+    if (prebundledDir == NULL) {
+        if (hasDir("/system/bundled-app")) {
+            prebundledDir = "/system/bundled-app";
+        } else {
+            prebundledDir = "/vendor/bundled-app";
+        }
+        setenv("PREBUNDLED_ROOT", prebundledDir, 1);
+    }
+
     //const char* kernelHack = getenv("LD_ASSUME_KERNEL");
     //ALOGD("Found LD_ASSUME_KERNEL='%s'\n", kernelHack);