Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4455)

Unified Diff: build/android/gyp/process_resources.py

Issue 647043007: Add OWNERS for chrome/android/java/res directory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make aapt ignore OWNERS files Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gyp/package_resources.py ('k') | build/android/gyp/util/build_utils.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/process_resources.py
diff --git a/build/android/gyp/process_resources.py b/build/android/gyp/process_resources.py
index 6f35388986ac79ef73700f0afc9d61e7f467a405..6bf71f35f9445c31dc3158149ec150891bbe6228 100755
--- a/build/android/gyp/process_resources.py
+++ b/build/android/gyp/process_resources.py
@@ -21,6 +21,7 @@ import generate_v14_compatible_resources
from util import build_utils
+
def ParseArgs(args):
"""Parses command line options.
@@ -220,7 +221,8 @@ def main():
'--auto-add-overlay',
'-I', android_jar,
'--output-text-symbols', gen_dir,
- '-J', gen_dir]
+ '-J', gen_dir,
+ '--ignore-assets', build_utils.AAPT_IGNORE_PATTERN]
for d in input_resource_dirs:
package_command += ['-S', d]
@@ -258,7 +260,8 @@ def main():
aapt_cmd = [aapt,
'crunch',
'-C', crunch_dir,
- '-S', d]
+ '-S', d,
+ '--ignore-assets', build_utils.AAPT_IGNORE_PATTERN]
build_utils.CheckOutput(aapt_cmd, stderr_filter=FilterCrunchStderr,
fail_func=DidCrunchFail)
« no previous file with comments | « build/android/gyp/package_resources.py ('k') | build/android/gyp/util/build_utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698