Reverted custom-loader.patch to use ANDROID_APP_PATH

inclement · inclement · commit 8113a1d806bd · 2017-01-20T19:13:55.000Z
diff --git a/pythonforandroid/recipes/python2/patches/custom-loader.patch b/pythonforandroid/recipes/python2/patches/custom-loader.patch
@@ -17,8 +17,8 @@
 +
 +    /* Ensure we have access to libpymodules. */
 +    if (libpymodules == -1) {
-+        printf("ANDROID_PRIVATE = %s\n", getenv("ANDROID_PRIVATE"));
-+        PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/app/libpymodules.so", getenv("ANDROID_PRIVATE"));
++        printf("ANDROID_APP_PATH = %s\n", getenv("ANDROID_APP_PATH"));
++        PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/libpymodules.so", getenv("ANDROID_APP_PATH"));
 +        libpymodules = dlopen(pathbuf, RTLD_NOW);
 +
 +        if (libpymodules == NULL) {

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`+`
`18`	`18`	`+ /* Ensure we have access to libpymodules. */`
`19`	`19`	`+ if (libpymodules == -1) {`
`20`		`-+ printf("ANDROID_PRIVATE = %s\n", getenv("ANDROID_PRIVATE"));`
`21`		`-+ PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/app/libpymodules.so", getenv("ANDROID_PRIVATE"));`
	`20`	`++ printf("ANDROID_APP_PATH = %s\n", getenv("ANDROID_APP_PATH"));`
	`21`	`++ PyOS_snprintf(pathbuf, sizeof(pathbuf), "%s/libpymodules.so", getenv("ANDROID_APP_PATH"));`
`22`	`22`	`+ libpymodules = dlopen(pathbuf, RTLD_NOW);`
`23`	`23`	`+`
`24`	`24`	`+ if (libpymodules == NULL) {`