diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 22:27:17 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 22:27:17 +0000 |
| commit | a9d2d08bfb8420d11384884f3a118463f30a8c98 (patch) | |
| tree | 810b7fbb2c9b3a56a2e5b3a3a78954433df7feec /build/java.gypi | |
| parent | cef547f75aca3ae9c1065a3c6133f8d1bcabfcdd (diff) | |
| download | chromium_src-a9d2d08bfb8420d11384884f3a118463f30a8c98.zip chromium_src-a9d2d08bfb8420d11384884f3a118463f30a8c98.tar.gz chromium_src-a9d2d08bfb8420d11384884f3a118463f30a8c98.tar.bz2 | |
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
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
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. |