Revert 156308 - Revert 156233 - Make apks be built in a consistent way

content/shell/android/java/content_shell_apk.xml

Index: content/shell/android/java/content_shell_apk.xml
diff --git a/content/shell/android/java/content_shell_apk.xml b/content/shell/android/java/content_shell_apk.xml
index 9182239da8b9ebaefd9c52e8246495362ad83d41..a1caf1a684104d3cd70a029338b57588a3dbac13 100644
--- a/content/shell/android/java/content_shell_apk.xml
+++ b/content/shell/android/java/content_shell_apk.xml
@@ -18,7 +18,7 @@
   <property-value name="target.abi" value="${APP_ABI}"/>
   <property-location name="out.dir" location="${PRODUCT_DIR}/content_shell"
       check-exists="false"/>
-  <property name="resource.absolute.dir" value="../res"/>
+  <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
   <property name="jar.libs.dir" value="${out.dir}/java/libs"/>
   <path id="native.libs.gdbserver">
@@ -32,7 +32,7 @@
   </path>
   <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/>
 
-  <echo>classpath: ${toString:out.dex.jar.input.ref}</echo>
+  <echo>resources: ${RESOURCE_DIR} classpath: ${toString:out.dex.jar.input.ref}</echo>
 
   <!-- We expect PRODUCT_DIR to be set like the gyp var (e.g. $ROOT/out/Debug) -->
   <fail message="PRODUCT_DIR env var not set?">