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

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

Issue 1413753005: GN: Remove mentions of lib.stripped (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//chrome/android/chrome_public_apk_tmpl.gni") 8 import("//chrome/android/chrome_public_apk_tmpl.gni")
9 import("//chrome/version.gni") 9 import("//chrome/version.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 #}], 413 #}],
414 #], 414 #],
415 } 415 }
416 416
417 chrome_public_apk_tmpl("chrome_public_apk") { 417 chrome_public_apk_tmpl("chrome_public_apk") {
418 version_name = "Developer Build" 418 version_name = "Developer Build"
419 version_code = "1" 419 version_code = "1"
420 android_manifest = get_target_outputs(":chrome_public_apk_manifest") 420 android_manifest = get_target_outputs(":chrome_public_apk_manifest")
421 android_manifest = android_manifest[1] 421 android_manifest = android_manifest[1]
422 apk_name = "ChromePublic" 422 apk_name = "ChromePublic"
423 native_libs = [ "$root_build_dir/lib.stripped/libchrome_public.so" ] 423 native_libs = [ "libchrome_public.so" ]
424 native_lib_version_rule = "//build/util:chrome_version_json" 424 native_lib_version_rule = "//build/util:chrome_version_json"
425 425
426 # Only attempt loading the library from the APK for 64 bit devices 426 # Only attempt loading the library from the APK for 64 bit devices
427 # until the number of 32 bit devices which don't support this 427 # until the number of 32 bit devices which don't support this
428 # approach falls to a minimal level - http://crbug.com/390618. 428 # approach falls to a minimal level - http://crbug.com/390618.
429 if (chromium_linker_supported && 429 if (chromium_linker_supported &&
430 (target_cpu == "arm64" || target_cpu == "x64")) { 430 (target_cpu == "arm64" || target_cpu == "x64")) {
431 load_library_from_apk = true 431 load_library_from_apk = true
432 } 432 }
433 433
(...skipping 24 matching lines...) Expand all
458 # TODO(GYP,cjhopman): Does this need version code/name? 458 # TODO(GYP,cjhopman): Does this need version code/name?
459 apk_name = "ChromePublicTest" 459 apk_name = "ChromePublicTest"
460 apk_under_test = ":chrome_public_apk" 460 apk_under_test = ":chrome_public_apk"
461 android_manifest = chrome_public_test_apk_manifest 461 android_manifest = chrome_public_test_apk_manifest
462 deps = [ 462 deps = [
463 ":chrome_public_test_apk_manifest", 463 ":chrome_public_test_apk_manifest",
464 "//chrome/android:chrome_shared_test_java", 464 "//chrome/android:chrome_shared_test_java",
465 ] 465 ]
466 isolate_file = "../chrome_public_test_apk.isolate" 466 isolate_file = "../chrome_public_test_apk.isolate"
467 } 467 }
OLDNEW
« no previous file with comments | « build/toolchain/gcc_toolchain.gni ('k') | third_party/mojo/src/mojo/public/mojo_application.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698