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

Unified Diff: content/content.gyp

Issue 23717023: Android: Add chrome-specific dynamic linker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Allow browser process to use shared RELROs too. Created 7 years, 2 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
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 221a1a53928a3e57c7edc508631022819b66a135..76d8b4aaab8c6e82820d2ab8141d5db29bef2315 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -494,6 +494,27 @@
},
'includes': [ 'content_jni.gypi' ],
},
+ {
+ 'target_name': 'content_android_linker',
+ 'type': 'shared_library',
+ 'conditions': [
+ ['android_webview_build == 0', {
+ # Avoid breaking the webview build because it doesn't have
+ # <(android_ndk_root)/crazy_linker.gyp. Note that it never uses
+ # the linker anyway.
+ 'sources': [
+ 'common/android/linker/linker_jni.cc',
+ ],
+ 'dependencies': [
+ '<(android_ndk_root)/crazy_linker.gyp:crazy_linker',
+ ],
+ 'includes': [
+ '../build/android/low_memory_device.gypi',
+ ],
+ }],
+ ],
+ },
+
],
}], # OS == "android"
],

Powered by Google App Engine
This is Rietveld 408576698