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

Side by Side Diff: build/config/android/internal_rules.gni

Issue 1211653002: [Android] Make dex exclude paths relative to output dir. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed paths to be relative to output dir. Created 5 years, 5 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 unified diff | Download patch
« build/android/gyp/dex.py ('K') | « build/android/gyp/dex.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 6
7 assert(is_android) 7 assert(is_android)
8 8
9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir) 9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir) 10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 deps = invoker.deps 144 deps = invoker.deps
145 } 145 }
146 146
147 rebased_output = rebase_path(invoker.output, root_build_dir) 147 rebased_output = rebase_path(invoker.output, root_build_dir)
148 148
149 args = [ 149 args = [
150 "--depfile", 150 "--depfile",
151 rebase_path(depfile, root_build_dir), 151 rebase_path(depfile, root_build_dir),
152 "--android-sdk-tools", 152 "--android-sdk-tools",
153 rebased_android_sdk_build_tools, 153 rebased_android_sdk_build_tools,
154 "--output-directory",
155 rebase_path(root_build_dir, root_build_dir),
154 "--dex-path", 156 "--dex-path",
155 rebased_output, 157 rebased_output,
156 ] 158 ]
157 159
158 if (defined(invoker.no_locals) && invoker.no_locals) { 160 if (defined(invoker.no_locals) && invoker.no_locals) {
159 args += [ "--no-locals=1" ] 161 args += [ "--no-locals=1" ]
160 } 162 }
161 163
162 if (defined(invoker.args)) { 164 if (defined(invoker.args)) {
163 args += invoker.args 165 args += invoker.args
(...skipping 1400 matching lines...) Expand 10 before | Expand all | Expand 10 after
1564 ] 1566 ]
1565 args = [ 1567 args = [
1566 "--depfile", 1568 "--depfile",
1567 rebase_path(depfile, root_build_dir), 1569 rebase_path(depfile, root_build_dir),
1568 "--script-output-path", 1570 "--script-output-path",
1569 rebase_path(generated_script, root_build_dir), 1571 rebase_path(generated_script, root_build_dir),
1570 ] 1572 ]
1571 args += test_runner_args 1573 args += test_runner_args
1572 } 1574 }
1573 } 1575 }
OLDNEW
« build/android/gyp/dex.py ('K') | « build/android/gyp/dex.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698