Update Android build to API level 17 and SDK Tools version 21

Some fixes included:
- Changes to resource management to account for new R.java packaging
  from library projects
  (https://android-review.googlesource.com/#/c/43134/).
- Fixed the package for some inludes in ModalDialogTest.java. This only
  worked because of how we previously used to aggregate all resoures
  from the prior layer. With the new packaging, we must use the resource
  from the appropriate layer.

BUG=163001,166434
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/11819047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176176 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 9 insertions, 5 deletions

diff --git a/build/android/ant/chromium-apk.xml b/build/android/ant/chromium-apk.xml
index 4fce8e9..72c2047 100644
--- a/build/android/ant/chromium-apk.xml
+++ b/build/android/ant/chromium-apk.xml
@@ -41,6 +41,9 @@
   <path id="project.library.res.folder.path">
     <filelist files="${ADDITIONAL_RES_DIRS}"/>
   </path>
+  <path id="project.library.bin.r.file.path">
+    <filelist files="${ADDITIONAL_R_TEXT_FILES}"/>
+  </path>
   <script language="javascript">
     var before = project.getProperty("ADDITIONAL_RES_PACKAGES");
     project.setProperty("project.library.packages", before.replaceAll(" ", ";"));
diff --git a/build/android/ant/create-test-jar.js b/build/android/ant/create-test-jar.js
index d22c003..d9014a3 100644
--- a/build/android/ant/create-test-jar.js
+++ b/build/android/ant/create-test-jar.js
@@ -14,7 +14,6 @@ importClass(org.apache.tools.ant.types.FileSet);
 importClass(org.apache.tools.ant.types.ZipFileSet);
 importClass(org.apache.tools.ant.taskdefs.Zip);
 
-var echo = project.createTask("echo");
 var jarTask = project.createTask("jar");
 
 // Do not allow duplicates in the jar, the default behavior of Jar task
@@ -64,7 +63,4 @@ for (var i in excludedClasses) {
 }
 
 jarTask.setExcludes(exclusionString);
-echo.setMessage("Creating test jar: " +
-                jarTask.getDestFile().getAbsolutePath());
-echo.perform();
 jarTask.perform();
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 10d9ec8..7d5024c 100644..100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -81,7 +81,7 @@ the one you want."
 fi
 
 # Android sdk platform version to use
-export ANDROID_SDK_VERSION=16
+export ANDROID_SDK_VERSION=17
 
 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then
   if [[ -z "${TARGET_ARCH}" ]]; then
diff --git a/build/android/process_resources.py b/build/android/process_resources.py
index 8a46e5c..b0a04af 100755
--- a/build/android/process_resources.py
+++ b/build/android/process_resources.py
@@ -63,6 +63,7 @@ def main():
                          '-M', dummy_manifest,
                          '-S', options.res_dir,
                          '-I', android_jar,
+                         '--output-text-symbols', options.R_dir,
                          '-J', options.R_dir])
 
   # Crunch image resources. This shrinks png files and is necessary for 9-patch
diff --git a/build/java.gypi b/build/java.gypi
index a13c88f..f958132 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -73,6 +73,7 @@
         'crunched_res_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/res',
         'R_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/java_R',
         'R_file': '<(R_dir)/<(R_package_relpath)/R.java',
+        'R_text_file': '<(R_dir)/R.txt',
         'generated_src_dirs': ['<(R_dir)'],
         'additional_input_paths': ['<(R_file)'],
       },
@@ -82,6 +83,7 @@
           # generated_R_dirs and additional_R_files.
           'generated_R_dirs': ['<(R_dir)'],
           'additional_R_files': ['<(R_file)'],
+          'additional_R_text_files': ['<(R_text_file)'],
 
           # Dependent APKs include this target's resources via
           # additional_res_dirs and additional_res_packages.
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 6d39188..d183e81 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -165,6 +165,7 @@
         '-DJAR_NAME=<(jar_name)',
         '-DPACKAGE_NAME=<(package_name)',
         '-DRESOURCE_DIR=<(resource_dir)',
+        '-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)',
         '-DADDITIONAL_RES_DIRS=>(additional_res_dirs)',
         '-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)',
         '-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)',
@@ -189,6 +190,7 @@
         # listed in the AndroidManifest.xml, which is unavoidable).
         'additional_res_dirs': ['<(DEPTH)/build/android/ant/empty/res'],
         'additional_res_packages': ['<(R_package)'],
+        'additional_R_text_files': ['<(PRODUCT_DIR)/<(package_name)/R.txt'],
       },
     }],
   ],