Commit a24bf2c4 authored by torne@chromium.org's avatar torne@chromium.org

Refactor lazy JNI registration support.

Rename the "linker_script_copy" target to "android_exports" and move the
link_settings clause to that target. This avoids the linker flag being
duplicated once for every target which includes jni_generator.gypi,
which causes problems on some linker versions.

BUG=402003

Review URL: https://codereview.chromium.org/473173004

Cr-Commit-Position: refs/heads/master@{#289941}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289941 0039d316-1c4b-4281-b951-d872f2087c98
parent 5b901fd3
......@@ -5,7 +5,7 @@
{
'targets': [
{
'target_name': 'linker_script_copy',
'target_name': 'android_exports',
'type': 'none',
'inputs': [
'<(DEPTH)/build/android/android_exports.lst',
......@@ -21,6 +21,19 @@
],
},
],
'conditions': [
['component=="static_library"', {
'link_settings': {
'ldflags': [
# Only export symbols that are specified in version script.
'-Wl,--version-script=<(android_linker_script)',
],
'ldflags!': [
'-Wl,--exclude-libs=ALL',
],
},
}],
],
},
],
}
......@@ -70,20 +70,7 @@
'native_exports%': '--native_exports',
},
'dependencies': [
'<(DEPTH)/build/linker_script_copy.gyp:linker_script_copy',
],
'conditions': [
['component=="static_library"', {
'link_settings': {
'ldflags': [
# Only export symbols that are specified in version script.
'-Wl,--version-script=<(android_linker_script)',
],
'ldflags!': [
'-Wl,--exclude-libs=ALL',
],
},
}],
'<(DEPTH)/build/android/android_exports.gyp:android_exports',
],
}],
],
......
......@@ -38,9 +38,6 @@
),
'native_exports%': '',
},
'dependencies': [
'<(DEPTH)/build/linker_script_copy.gyp:linker_script_copy',
],
'rules': [
{
'rule_name': 'generate_jni_headers',
......@@ -92,20 +89,7 @@
'native_exports%': '--native_exports',
},
'dependencies': [
'<(DEPTH)/build/linker_script_copy.gyp:linker_script_copy',
],
'conditions': [
['component=="static_library"', {
'link_settings': {
'ldflags': [
# Only export symbols that are specified in version script.
'-Wl,--version-script=<(android_linker_script)',
],
'ldflags!': [
'-Wl,--exclude-libs=ALL',
],
},
}],
'<(DEPTH)/build/android/android_exports.gyp:android_exports',
],
}],
],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment