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

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: Update content_tests.gypi 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
« no previous file with comments | « content/common/android/linker/linker_jni.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index c7f35757ad18e57bff1206c03a40e22d50cc6c5d..3a5cf1ff261f69c9d1244a20adc627a59caf22b0 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -490,6 +490,24 @@
},
'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',
+ ],
+ }],
+ ],
+ },
+
],
}], # OS == "android"
],
« no previous file with comments | « content/common/android/linker/linker_jni.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698