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

Unified Diff: build/java_apk.gypi

Issue 599093005: [Android] Insert chromium version string into native libraries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/insert_chromium_version.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 2c9f4a595b896cde85a8d663dee91e65afe0e029..9578a410f6f9f1b89a653e78d0070965e92289e4 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -110,6 +110,7 @@
'strip_stamp': '<(intermediate_dir)/strip.stamp',
'stripped_libraries_dir': '<(intermediate_dir)/stripped_libraries',
'strip_additional_stamp': '<(intermediate_dir)/strip_additional.stamp',
+ 'version_stamp': '<(intermediate_dir)/version.stamp',
'javac_includes': [],
'jar_excluded_classes': [],
'javac_jar_path': '<(intermediate_dir)/<(_target_name).javac.jar',
@@ -364,6 +365,19 @@
'includes': ['../build/android/pack_arm_relocations.gypi'],
},
{
+ 'action_name': 'insert_chromium_version',
+ 'variables': {
+ 'ordered_libraries_file%': '<(ordered_libraries_file)',
+ 'libraries_source_dir%': '<(libraries_source_dir)',
+ 'version_string': '<(native_lib_version_name)',
+ 'input_paths': [
+ '<(pack_arm_relocations_stamp)',
+ ],
+ 'stamp': '<(version_stamp)'
+ },
+ 'includes': ['../build/android/insert_chromium_version.gypi'],
+ },
+ {
'variables': {
'input_libraries': [
'<@(additional_bundled_libs)',
@@ -461,8 +475,8 @@
'variables': {
'inputs': [
'<(ordered_libraries_file)',
- '<(pack_arm_relocations_stamp)',
'<(strip_additional_stamp)',
+ '<(version_stamp)',
],
'input_apk_path': '<(unsigned_apk_path)',
'output_apk_path': '<(unsigned_standalone_apk_path)',
@@ -478,8 +492,8 @@
'variables': {
'libraries_source_dir': '<(apk_package_native_libs_dir)/<(android_app_abi)',
'package_input_paths': [
- '<(pack_arm_relocations_stamp)',
'<(strip_additional_stamp)',
+ '<(version_stamp)',
],
},
}],
« no previous file with comments | « build/android/insert_chromium_version.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698