diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 23:33:38 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 23:33:38 +0000 |
| commit | 94542cd16235b34fbe46e5ab35109abefc90642c (patch) | |
| tree | ad132023309281e0334e20262706778322a4f560 /build/java.gypi | |
| parent | a8fab9af0ce7605d7b4be2c19a88ba8cf4de59db (diff) | |
| download | chromium_src-94542cd16235b34fbe46e5ab35109abefc90642c.zip chromium_src-94542cd16235b34fbe46e5ab35109abefc90642c.tar.gz chromium_src-94542cd16235b34fbe46e5ab35109abefc90642c.tar.bz2 | |
Revert 176198
Fixed permissions on build/android/envsetup.sh
> 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
TBR=smckay@chromium.org
Review URL: https://codereview.chromium.org/11820065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176202 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. |