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

Side by Side Diff: content/shell/android/BUILD.gn

Issue 1314823003: Make Linker.isUsed() static, and clean up the fallout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tiny log tweak, protected->private, rebase to master. Created 5 years, 3 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
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 import("//build/module_args/v8.gni") 7 import("//build/module_args/v8.gni")
8 import("//third_party/icu/config.gni") 8 import("//third_party/icu/config.gni")
9 9
10 generate_jni("content_shell_jni_headers") { 10 generate_jni("content_shell_jni_headers") {
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 "//base:base_javatests", 159 "//base:base_javatests",
160 "//net/android:net_javatests", 160 "//net/android:net_javatests",
161 ] 161 ]
162 data_deps = [ ":content_shell_apk" ] 162 data_deps = [ ":content_shell_apk" ]
163 apk_under_test = ":content_shell_apk" 163 apk_under_test = ":content_shell_apk"
164 apk_name = "ContentShellTest" 164 apk_name = "ContentShellTest"
165 android_manifest = "javatests/AndroidManifest.xml" 165 android_manifest = "javatests/AndroidManifest.xml"
166 isolate_file = "../../content_shell_test_apk.isolate" 166 isolate_file = "../../content_shell_test_apk.isolate"
167 } 167 }
168 168
169 if (current_cpu != "x64" && current_cpu != "arm64") { 169 if (current_cpu != "x64") {
170 chromium_linker_test_manifest = 170 chromium_linker_test_manifest =
171 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" 171 "$target_gen_dir/linker_test_apk/AndroidManifest.xml"
172 172
173 jinja_template("chromium_linker_test_manifest") { 173 jinja_template("chromium_linker_test_manifest") {
174 testonly = true 174 testonly = true
175 input = "linker_test_apk/AndroidManifest.xml.jinja2" 175 input = "linker_test_apk/AndroidManifest.xml.jinja2"
176 output = chromium_linker_test_manifest 176 output = chromium_linker_test_manifest
177 } 177 }
178 178
179 android_resources("linker_resources") { 179 android_resources("linker_resources") {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers 229 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers
230 generate_jni("linker_test_jni_headers") { 230 generate_jni("linker_test_jni_headers") {
231 testonly = true 231 testonly = true
232 jni_package = "content/shell" 232 jni_package = "content/shell"
233 sources = [ 233 sources = [
234 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a", 234 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a",
235 ] 235 ]
236 } 236 }
237 } 237 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698