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

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

Issue 951353003: Allow to exlude jar in android_standalone_library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase path before passing it to external command. Created 5 years, 10 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 | « no previous file | build/config/android/internal_rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/dex.py
diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
index d89c7c21ec1e3f811644d0f75ec76debfdd6642a..4e6233270aeec7bebbd55462858b23b2f21e559d 100755
--- a/build/android/gyp/dex.py
+++ b/build/android/gyp/dex.py
@@ -50,9 +50,8 @@ def main():
parser.add_option('--no-locals',
help='Exclude locals list from the dex file.')
parser.add_option('--inputs', help='A list of additional input paths.')
- parser.add_option('--excluded-paths-file',
- help='Path to a file containing a list of paths to exclude '
- 'from the dex file.')
+ parser.add_option('--excluded-paths',
+ help='A list of paths to exclude from the dex file.')
options, paths = parser.parse_args(args)
@@ -63,13 +62,13 @@ def main():
and options.configuration_name == 'Release'):
paths = [options.proguard_enabled_input_path]
- if options.excluded_paths_file:
- exclude_paths = build_utils.ReadJson(options.excluded_paths_file)
- paths = [p for p in paths if not p in exclude_paths]
-
if options.inputs:
paths += build_utils.ParseGypList(options.inputs)
+ if options.excluded_paths:
+ exclude_paths = build_utils.ParseGypList(options.excluded_paths)
+ paths = [p for p in paths if not p in exclude_paths]
+
DoDex(options, paths)
if options.depfile:
« no previous file with comments | « no previous file | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698