Bug 692988 - Give Flash a valid application directory

dom/plugins/base/android/ANPSystem.cpp

@@ -52,8 +52,14 @@
 const char*
 anp_system_getApplicationDataDirectory()
 {
-  LOG("getApplicationDataDirectory return /data/data/org.mozilla.%s", MOZ_APP_NAME);
+  static char *dir = NULL;
-  return "/data/data/org.mozilla." MOZ_APP_NAME;
+
+  if (!dir) {
+    dir = getenv("ANDROID_PLUGIN_DATADIR");
+  }
+
+  LOG("getApplicationDataDirectory return %s", dir);
+  return dir;
 }
 
 jclass anp_system_loadJavaClass(NPP instance, const char* className)

embedding/android/GeckoAppShell.java

@@ -364,6 +364,9 @@ public class GeckoAppShell
         File cacheFile = getCacheDir();
         GeckoAppShell.putenv("CACHE_PATH=" + cacheFile.getPath());
 
+        File pluginDataDir = GeckoApp.mAppContext.getDir("plugins", 0);
+        GeckoAppShell.putenv("ANDROID_PLUGIN_DATADIR=" + pluginDataDir.getPath());
+
         // gingerbread introduces File.getUsableSpace(). We should use that.
         long freeSpace = getFreeSpace();
         try {