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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/android/rules.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 59a6c5b7af6329f6ef069a4fdbf2544753156f8e..02226f68d721de8fa1884c54a0dfc9570e13a952 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -320,6 +320,19 @@ jinja_template("chrome_shell_manifest") {
output = chrome_shell_manifest
}
+# TODO(cjhopman): This should actually be done as a build step instead of at gn
+# time.
+_version_py_path = "//build/util/version.py"
+_chrome_version_path = "//chrome/VERSION"
+_version_full = exec_script(_version_py_path,
+ [
+ "-f",
+ rebase_path(_chrome_version_path, root_build_dir),
+ "-t \"@MAJOR@.@MINOR@.@BUILD@.@PATCH@\"",
+ ],
+ "value",
+ [ _chrome_version_path ])
+
# GYP: //chrome/chrome_shell.gypi:chrome_shell_apk
android_apk("chrome_shell_apk") {
testonly = true
@@ -333,6 +346,7 @@ android_apk("chrome_shell_apk") {
apk_name = "ChromeShell"
android_manifest = chrome_shell_manifest
native_libs = [ "libchrome_shell.so" ]
+ native_lib_version_name = _version_full
asset_location = chrome_shell_assets_dir
#TODO(GYP):
« 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