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

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

Issue 1007053002: Add native lib version name to chrome_shell_apk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-fix-resources
Patch Set: Created 5 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 | « build/config/android/rules.gni ('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 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("//chrome/version.gni") 8 import("//chrome/version.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 import("//third_party/icu/config.gni") 10 import("//third_party/icu/config.gni")
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 chrome_shell_manifest = 313 chrome_shell_manifest =
314 "$target_gen_dir/chrome_shell_manifest/AndroidManifest.xml" 314 "$target_gen_dir/chrome_shell_manifest/AndroidManifest.xml"
315 315
316 # GYP: //chrome/chrome_shell.gypi:chrome_shell_manifest 316 # GYP: //chrome/chrome_shell.gypi:chrome_shell_manifest
317 jinja_template("chrome_shell_manifest") { 317 jinja_template("chrome_shell_manifest") {
318 testonly = true 318 testonly = true
319 input = "shell/java/AndroidManifest.xml.jinja2" 319 input = "shell/java/AndroidManifest.xml.jinja2"
320 output = chrome_shell_manifest 320 output = chrome_shell_manifest
321 } 321 }
322 322
323 # TODO(cjhopman): This should actually be done as a build step instead of at gn
324 # time.
325 _version_py_path = "//build/util/version.py"
326 _chrome_version_path = "//chrome/VERSION"
327 _version_full = exec_script(_version_py_path,
328 [
329 "-f",
330 rebase_path(_chrome_version_path, root_build_dir),
331 "-t \"@MAJOR@.@MINOR@.@BUILD@.@PATCH@\"",
332 ],
333 "value",
334 [ _chrome_version_path ])
335
323 # GYP: //chrome/chrome_shell.gypi:chrome_shell_apk 336 # GYP: //chrome/chrome_shell.gypi:chrome_shell_apk
324 android_apk("chrome_shell_apk") { 337 android_apk("chrome_shell_apk") {
325 testonly = true 338 testonly = true
326 deps = [ 339 deps = [
327 "//base:base_java", 340 "//base:base_java",
328 ":chrome_shell_resources", 341 ":chrome_shell_resources",
329 ":chrome_shell_java", 342 ":chrome_shell_java",
330 ":chrome_shell_assets", 343 ":chrome_shell_assets",
331 ":chrome_shell", 344 ":chrome_shell",
332 ] 345 ]
333 apk_name = "ChromeShell" 346 apk_name = "ChromeShell"
334 android_manifest = chrome_shell_manifest 347 android_manifest = chrome_shell_manifest
335 native_libs = [ "libchrome_shell.so" ] 348 native_libs = [ "libchrome_shell.so" ]
349 native_lib_version_name = _version_full
336 asset_location = chrome_shell_assets_dir 350 asset_location = chrome_shell_assets_dir
337 351
338 #TODO(GYP): 352 #TODO(GYP):
339 #'variables': { 353 #'variables': {
340 #'conditions': [ 354 #'conditions': [
341 #['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { 355 #['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', {
342 ## Only enable the chromium linker on regular builds, since the 356 ## Only enable the chromium linker on regular builds, since the
343 ## component build crashes on Android 4.4. See b/11379966 357 ## component build crashes on Android 4.4. See b/11379966
344 #'use_chromium_linker': '1', 358 #'use_chromium_linker': '1',
345 #}], 359 #}],
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 ] 501 ]
488 } 502 }
489 503
490 zip("chrome_version_srcjar") { 504 zip("chrome_version_srcjar") {
491 inputs = [ 505 inputs = [
492 chrome_version_java_file, 506 chrome_version_java_file,
493 ] 507 ]
494 output = "$target_gen_dir/$target_name.srcjar" 508 output = "$target_gen_dir/$target_name.srcjar"
495 base_dir = chrome_version_java_dir 509 base_dir = chrome_version_java_dir
496 } 510 }
OLDNEW
« no previous file with comments | « build/config/android/rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698