diff options
| author | aurimas <aurimas@chromium.org> | 2015-04-23 11:24:39 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 18:25:11 +0000 |
| commit | d90131fcdc10b4cdacc3be1e7bac78446708edad (patch) | |
| tree | 25c5de5f8cbd22e4b7ce00fb8569852731d58902 /build | |
| parent | 697f429d75099ea436aee5beb9ea0c26c7dea497 (diff) | |
| download | chromium_src-d90131fcdc10b4cdacc3be1e7bac78446708edad.zip chromium_src-d90131fcdc10b4cdacc3be1e7bac78446708edad.tar.gz chromium_src-d90131fcdc10b4cdacc3be1e7bac78446708edad.tar.bz2 | |
Revert of Revert of Roll Android SDK and AppCompat. (patchset #1 id:1 of https://codereview.chromium.org/1092843003/)
Reason for revert:
Downstream needs a fix in styles.xml to roll this in.
Original issue's description:
> Revert of Roll Android SDK and AppCompat. (patchset #2 id:20001 of https://codereview.chromium.org/1101633003/)
>
> Reason for revert:
> Breaks downstream Chrome Android ToT instrumentation test.
> BUG=480285
>
> Original issue's description:
> > Roll Android SDK and AppCompat.
> >
> > - Android SDK rolls to API 22 rev 2
> > (no API changes, just bug fixes)
> > - Android Support Library rolls to 22.1.0
> >
> > BUG=479858
> >
> > Committed: https://crrev.com/a068236fabb7a1925df7494bd668c2b58b26979a
> > Cr-Commit-Position: refs/heads/master@{#326437}
>
> TBR=newt@chromium.org,cjhopman@chromium.org,aurimas@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=479858
>
> Committed: https://crrev.com/dd703b9316d9b346ec1bf6ec357884d40ffe80e6
> Cr-Commit-Position: refs/heads/master@{#326484}
TBR=newt@chromium.org,cjhopman@chromium.org,pasko@chromium.org,azarchs@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=480285
Review URL: https://codereview.chromium.org/1086523004
Cr-Commit-Position: refs/heads/master@{#326583}
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/gyp/process_resources.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/android/gyp/process_resources.py b/build/android/gyp/process_resources.py index 52cf143..4e6c27d 100755 --- a/build/android/gyp/process_resources.py +++ b/build/android/gyp/process_resources.py @@ -10,6 +10,7 @@ This will crunch images and generate v14 compatible resources (see generate_v14_compatible_resources.py). """ +import codecs import optparse import os import re @@ -112,14 +113,15 @@ def CreateExtraRJavaFiles(r_dir, extra_packages): if len(java_files) != 1: return r_java_file = java_files[0] - r_java_contents = open(r_java_file).read() + r_java_contents = codecs.open(r_java_file, encoding='utf-8').read() for package in extra_packages: package_r_java_dir = os.path.join(r_dir, *package.split('.')) build_utils.MakeDirectory(package_r_java_dir) package_r_java_path = os.path.join(package_r_java_dir, 'R.java') - open(package_r_java_path, 'w').write( - re.sub(r'package [.\w]*;', 'package %s;' % package, r_java_contents)) + new_r_java = re.sub(r'package [.\w]*;', u'package %s;' % package, + r_java_contents) + codecs.open(package_r_java_path, 'w', encoding='utf-8').write(new_r_java) # TODO(cjhopman): These extra package's R.java files should be filtered to # only contain the resources listed in their R.txt files. At this point, we # have already compiled those other libraries, so doing this would only |