apk: Use external cache dir (#745)

Accessing the root of external storage is deprecated, so use the app-specific external storage directory instead. As a bonus, this does not require any permissions.

7 files changed, 20 insertions, 17 deletions

diff --git a/android_gradle/amber.sh b/android_gradle/amber.sh
index f919741..e58e62e 100755
--- a/android_gradle/amber.sh
+++ b/android_gradle/amber.sh
@@ -27,12 +27,12 @@ args+=("${arg}")
 index=$((index+1))
 done
 
-adb shell rm -f /sdcard/amber_stdout.txt
-adb shell rm -f /sdcard/amber_stderr.txt
+adb shell rm -f /sdcard/Android/data/com.google.amber/cache/amber_stdout.txt
+adb shell rm -f /sdcard/Android/data/com.google.amber/cache/amber_stderr.txt
 adb shell am instrument -w \
-  -e stdout /sdcard/amber_stdout.txt \
-  -e stderr /sdcard/amber_stderr.txt \
+  -e stdout /sdcard/Android/data/com.google.amber/cache/amber_stdout.txt \
+  -e stderr /sdcard/Android/data/com.google.amber/cache/amber_stderr.txt \
   "${args[@]@Q}" \
   com.google.amber.test/androidx.test.runner.AndroidJUnitRunner
-adb shell cat /sdcard/amber_stdout.txt
-adb shell cat /sdcard/amber_stderr.txt
+adb shell cat /sdcard/Android/data/com.google.amber/cache/amber_stdout.txt
+adb shell cat /sdcard/Android/data/com.google.amber/cache/amber_stderr.txt
diff --git a/android_gradle/app/jniLibs/.gitignore b/android_gradle/app/jniLibs/.gitignore
index f935021..d6b7ef3 100644
--- a/android_gradle/app/jniLibs/.gitignore
+++ b/android_gradle/app/jniLibs/.gitignore
@@ -1 +1,2 @@
+*
 !.gitignore
diff --git a/android_gradle/app/src/androidTest/AndroidManifest.xml b/android_gradle/app/src/androidTest/AndroidManifest.xml
index 2c91852..43a04d9 100644
--- a/android_gradle/app/src/androidTest/AndroidManifest.xml
+++ b/android_gradle/app/src/androidTest/AndroidManifest.xml
@@ -1,7 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.amber.test">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <application android:requestLegacyExternalStorage="true">
-    </application>
 </manifest>
diff --git a/android_gradle/app/src/androidTest/java/com/google/amber/AmberLauncher.java b/android_gradle/app/src/androidTest/java/com/google/amber/AmberLauncher.java
index 7755245..4864843 100644
--- a/android_gradle/app/src/androidTest/java/com/google/amber/AmberLauncher.java
+++ b/android_gradle/app/src/androidTest/java/com/google/amber/AmberLauncher.java
@@ -15,10 +15,15 @@
 package com.google.amber;
 
 import static org.junit.Assert.assertEquals;
+
 import android.content.Context;
 import android.os.Bundle;
+
 import androidx.test.platform.app.InstrumentationRegistry;
+
 import org.junit.Test;
+
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -43,8 +48,11 @@ public class AmberLauncher {
       ++arg_index;
     }
 
-    String stdout_file = args.getString("stdout", "/sdcard/amber_stdout.txt");
-    String stderr_file = args.getString("stderr", "/sdcard/amber_stderr.txt");
+    File outputDir = app_context.getExternalCacheDir();
+
+    // This will typically be: /sdcard/Android/data/com.google.amber/cache/amber_std{out,err}.txt
+    String stdout_file = args.getString("stdout", new File(outputDir, "amber_stdout.txt").toString());
+    String stderr_file = args.getString("stderr", new File(outputDir, "amber_stderr.txt").toString());
 
     int res = Amber.androidMain(args_list.toArray(new String[0]), stdout_file, stderr_file);
 
diff --git a/android_gradle/app/src/main/AndroidManifest.xml b/android_gradle/app/src/main/AndroidManifest.xml
index caa16a6..aea99aa 100644
--- a/android_gradle/app/src/main/AndroidManifest.xml
+++ b/android_gradle/app/src/main/AndroidManifest.xml
@@ -2,12 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.amber">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
     <application
         android:allowBackup="true"
         android:label="Amber"
-        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true">
     </application>
 
diff --git a/android_gradle/build.gradle b/android_gradle/build.gradle
index 8854578..82c93bf 100644
--- a/android_gradle/build.gradle
+++ b/android_gradle/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0-alpha01'
+        classpath 'com.android.tools.build:gradle:4.0.0-alpha04'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/android_gradle/gradle/wrapper/gradle-wrapper.properties b/android_gradle/gradle/wrapper/gradle-wrapper.properties
index e74b1c7..421d5b6 100644
--- a/android_gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/android_gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 06 10:00:39 GMT 2019
+#Mon Dec 09 14:37:37 GMT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-1-all.zip