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

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

Issue 721123002: GN: Have android_apk always look for stripped libraries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Follow review Created 6 years, 1 month 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 | « build/config/android/rules.gni ('k') | content/shell/android/BUILD.gn » ('j') | 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 import("//chrome/version.gni") 7 import("//chrome/version.gni")
8 import("//third_party/icu/config.gni") 8 import("//third_party/icu/config.gni")
9 import("channel.gni") 9 import("channel.gni")
10 10
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 testonly = true 326 testonly = true
327 deps = [ 327 deps = [
328 ":chrome_shell_resources", 328 ":chrome_shell_resources",
329 ":chrome_shell_java", 329 ":chrome_shell_java",
330 ":chrome_shell_assets", 330 ":chrome_shell_assets",
331 ":chrome_shell", 331 ":chrome_shell",
332 ] 332 ]
333 apk_name = "ChromeShell" 333 apk_name = "ChromeShell"
334 android_manifest = chrome_shell_manifest 334 android_manifest = chrome_shell_manifest
335 native_libs = [ 335 native_libs = [
336 "$root_build_dir/lib.stripped/libchrome_shell.so" 336 "libchrome_shell.so"
337 ] 337 ]
338 asset_location = chrome_shell_assets_dir 338 asset_location = chrome_shell_assets_dir
339 339
340 #TODO(GYP): 340 #TODO(GYP):
341 #'variables': { 341 #'variables': {
342 #'conditions': [ 342 #'conditions': [
343 #['component != "shared_library" and target_arch != "arm64" and target_arch != " x64" and profiling_full_stack_frames != 1', { 343 #['component != "shared_library" and target_arch != "arm64" and target_arch != " x64" and profiling_full_stack_frames != 1', {
344 ## Only enable the chromium linker on regular builds, since the 344 ## Only enable the chromium linker on regular builds, since the
345 ## component build crashes on Android 4.4. See b/11379966 345 ## component build crashes on Android 4.4. See b/11379966
346 #'use_chromium_linker': '1', 346 #'use_chromium_linker': '1',
347 #}], 347 #}],
348 #], 348 #],
349 #}, 349 #},
350 350
351 } 351 }
352 352
353 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk 353 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk
354 android_apk("chrome_sync_shell_apk") { 354 android_apk("chrome_sync_shell_apk") {
355 testonly = true 355 testonly = true
356 deps = [ 356 deps = [
357 ":chrome_shell_resources", 357 ":chrome_shell_resources",
358 ":chrome_shell_java", 358 ":chrome_shell_java",
359 ":chrome_shell_assets", 359 ":chrome_shell_assets",
360 ":chrome_sync_shell", 360 ":chrome_sync_shell",
361 ] 361 ]
362 apk_name = "ChromeSyncShell" 362 apk_name = "ChromeSyncShell"
363 android_manifest = "sync_shell/java/AndroidManifest.xml" 363 android_manifest = "sync_shell/java/AndroidManifest.xml"
364 native_libs = [ 364 native_libs = [
365 "$root_build_dir/lib.stripped/libchrome_sync_shell.so" 365 "libchrome_sync_shell.so"
366 ] 366 ]
367 asset_location = chrome_shell_assets_dir 367 asset_location = chrome_shell_assets_dir
368 } 368 }
369 369
370 # GYP: part of //chrome/chrome_tests.gypi:chrome_shell_test_apk 370 # GYP: part of //chrome/chrome_tests.gypi:chrome_shell_test_apk
371 android_library("chrome_javatests") { 371 android_library("chrome_javatests") {
372 testonly = true 372 testonly = true
373 DEPRECATED_java_in_dir = "javatests/src" 373 DEPRECATED_java_in_dir = "javatests/src"
374 deps = [ 374 deps = [
375 ":chrome_java", 375 ":chrome_java",
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 source = "java/ChromeVersionConstants.java.version" 469 source = "java/ChromeVersionConstants.java.version"
470 output = chrome_version_java_file 470 output = chrome_version_java_file
471 extra_args = ["-e", "CHANNEL=str.upper('$android_channel')"] 471 extra_args = ["-e", "CHANNEL=str.upper('$android_channel')"]
472 } 472 }
473 473
474 zip("chrome_version_srcjar") { 474 zip("chrome_version_srcjar") {
475 inputs = [ chrome_version_java_file ] 475 inputs = [ chrome_version_java_file ]
476 output = "$target_gen_dir/$target_name.srcjar" 476 output = "$target_gen_dir/$target_name.srcjar"
477 base_dir = chrome_version_java_dir 477 base_dir = chrome_version_java_dir
478 } 478 }
OLDNEW
« no previous file with comments | « build/config/android/rules.gni ('k') | content/shell/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698