diff options
| author | smckay@chromium.org <smckay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 23:18:11 +0000 |
|---|---|---|
| committer | smckay@chromium.org <smckay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 23:18:11 +0000 |
| commit | 6160112beb92fa89d47236c149b0fe9c48676d5e (patch) | |
| tree | cc975a2d5e4ab8be7a520312fece8fa59dd118a8 /build/java.gypi | |
| parent | ee49695d22fe52592053e393da9836e80b9a3346 (diff) | |
| download | chromium_src-6160112beb92fa89d47236c149b0fe9c48676d5e.zip chromium_src-6160112beb92fa89d47236c149b0fe9c48676d5e.tar.gz chromium_src-6160112beb92fa89d47236c149b0fe9c48676d5e.tar.bz2 | |
Revert 176176
> 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
TBR=yfriedman@chromium.org
Review URL: https://codereview.chromium.org/11783108
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/build/java.gypi b/build/java.gypi index f958132..a13c88f 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -73,7 +73,6 @@ '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)'], }, @@ -83,7 +82,6 @@ # 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. |