build/java_apk.gypi - Issue 59533009: Check library version and handle library load errors

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/java_apk.gypi

Issue 59533009: Check library version and handle library load errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Respond to second round of review comments. Created 7 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 side-by-side diff with in-line comments

Download patch

« build/android/gyp/create_native_libraries_header.py ('K') | « build/android/gyp/create_native_libraries_header.py ('k') | chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java » ('j') | content/app/android/library_loader_hooks.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/java_apk.gypi

diff --git a/build/java_apk.gypi b/build/java_apk.gypi

index 2485ed59d829f6f98c5d8b5d0a6301e12b4a2f27..979f4498cdfd66a76c524dd7adea2c5036689849 100644

--- a/build/java_apk.gypi

+++ b/build/java_apk.gypi

@@ -89,7 +89,7 @@

'native_libraries_java_stamp': '<(intermediate_dir)/native_libraries_java.stamp',

'native_libraries_template_data_dir': '<(intermediate_dir)/native_libraries/',

'native_libraries_template_data_file': '<(native_libraries_template_data_dir)/native_libraries_array.h',

- 'native_libraries_template_data_stamp': '<(intermediate_dir)/native_libraries_template_data.stamp',

+ 'native_libraries_template_version_file': '<(native_libraries_template_data_dir)/native_libraries_version.h',

'compile_stamp': '<(intermediate_dir)/compile.stamp',

'instr_stamp': '<(intermediate_dir)/instr.stamp',

'jar_stamp': '<(intermediate_dir)/jar.stamp',

@@ -120,6 +120,7 @@

'variables': {

'native_lib_target%': '',

+ 'native_lib_version_name%': '',

'use_content_linker%': 0,

'enable_content_linker_tests%': 0,

'is_test_apk%': 0,

@@ -143,6 +144,7 @@

'native_lib_target%': '',

+ 'native_lib_version_name%': '',

'use_content_linker%': 0,

'enable_content_linker_tests%': 0,

'emma_instrument': '<(emma_instrument)',

@@ -239,13 +241,15 @@

'<(ordered_libraries_file)',

'outputs': [

- '<(native_libraries_template_data_stamp)',

+ '<(native_libraries_template_data_file)',

+ '<(native_libraries_template_version_file)',

'action': [

'python', '<(DEPTH)/build/android/gyp/create_native_libraries_header.py',

'--ordered-libraries=<(ordered_libraries_file)',

- '--output=<(native_libraries_template_data_file)',

- '--stamp=<(native_libraries_template_data_stamp)',

+ '--version-name=<(native_lib_version_name)',

+ '--native-library-list=<(native_libraries_template_data_file)',

+ '--version-output=<(native_libraries_template_version_file)',

{

@@ -284,7 +288,8 @@

'inputs': [

'<(DEPTH)/build/android/gyp/util/build_utils.py',

'<(DEPTH)/build/android/gyp/gcc_preprocess.py',

- '<(native_libraries_template_data_stamp)',

+ '<(native_libraries_template_data_file)',

+ '<(native_libraries_template_version_file)',

'<(native_libraries_template)',

'outputs': [