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

Side by Side Diff: build/android/BUILD.gn

Issue 2752093003: Remove hard-coded sdk build tools path from test_runner_py target. (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « no previous file | 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 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 7
8 if (enable_java_templates) { 8 if (enable_java_templates) {
9 import("//third_party/ijar/ijar.gni") 9 import("//third_party/ijar/ijar.gni")
10 10
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 _py_files = read_file("test_runner.pydeps", "list lines") 107 _py_files = read_file("test_runner.pydeps", "list lines")
108 108
109 # Filter out comments. 109 # Filter out comments.
110 set_sources_assignment_filter([ "#*" ]) 110 set_sources_assignment_filter([ "#*" ])
111 sources = _py_files 111 sources = _py_files
112 112
113 data = sources + [ 113 data = sources + [
114 "devil_chromium.json", 114 "devil_chromium.json",
115 "pylib/gtest/filter/", 115 "pylib/gtest/filter/",
116 "test_wrapper/logdog_wrapper.py", 116 "test_wrapper/logdog_wrapper.py",
117 "//third_party/android_tools/sdk/build-tools/24.0.2/aapt", 117 "${android_sdk_build_tools}/aapt",
118 "//third_party/android_tools/sdk/build-tools/24.0.2/dexdump", 118 "${android_sdk_build_tools}/dexdump",
119 "//third_party/android_tools/sdk/build-tools/24.0.2/lib64/libc++.so", 119 "${android_sdk_build_tools}/lib64/libc++.so",
120 "//third_party/android_tools/sdk/build-tools/24.0.2/split-select", 120 "${android_sdk_build_tools}/split-select",
121 "//third_party/android_tools/sdk/platform-tools/adb", 121 "${android_sdk_root}/platform-tools/adb",
122 "//third_party/catapult/third_party/gsutil/", 122 "//third_party/catapult/third_party/gsutil/",
123 "//third_party/catapult/devil/devil/devil_dependencies.json", 123 "//third_party/catapult/devil/devil/devil_dependencies.json",
124 "//third_party/proguard/lib/proguard.jar", 124 "//third_party/proguard/lib/proguard.jar",
125 ] 125 ]
126 } 126 }
127 127
128 # Create wrapper scripts in out/bin that takes care of setting the 128 # Create wrapper scripts in out/bin that takes care of setting the
129 # --output-directory. 129 # --output-directory.
130 _scripts_to_wrap = [ 130 _scripts_to_wrap = [
131 # TODO(agrieve): Once GYP is no more, delete the checked-in adb_gdb_* scripts 131 # TODO(agrieve): Once GYP is no more, delete the checked-in adb_gdb_* scripts
(...skipping 12 matching lines...) Expand all
144 _target_name = get_path_info(script, "name") + "_wrapper" 144 _target_name = get_path_info(script, "name") + "_wrapper"
145 _wrapper_targets += [ ":$_target_name" ] 145 _wrapper_targets += [ ":$_target_name" ]
146 wrapper_script(_target_name) { 146 wrapper_script(_target_name) {
147 target = script 147 target = script
148 } 148 }
149 } 149 }
150 150
151 group("wrapper_scripts") { 151 group("wrapper_scripts") {
152 deps = _wrapper_targets 152 deps = _wrapper_targets
153 } 153 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698