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

Unified Diff: third_party/ashmem/ashmem.gyp

Issue 12674026: Android WebView: use the system ashmem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add digit@ as owner for ashmem Created 7 years, 9 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 | « third_party/ashmem/OWNERS ('k') | tools/generate_shim_headers/generate_shim_headers.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/ashmem/ashmem.gyp
diff --git a/third_party/ashmem/ashmem.gyp b/third_party/ashmem/ashmem.gyp
index 36e231f268b0245557785e3bb9a57ebd3041a484..82e893a9cd7bb90054584d57311597bfcd9a8932 100644
--- a/third_party/ashmem/ashmem.gyp
+++ b/third_party/ashmem/ashmem.gyp
@@ -6,10 +6,28 @@
'targets': [
{
'target_name': 'ashmem',
- 'type': 'static_library',
- 'sources': [
- 'ashmem.h',
- 'ashmem-dev.c'
+ 'conditions': [
+ ['android_webview_build==1', {
+ # WebView must use the Android system version of ashmem to avoid
+ # linking problems.
+ 'type': 'none',
+ 'variables': {
+ 'headers_root_path': '.',
+ 'header_filenames': [ 'ashmem.h' ],
+ 'shim_generator_additional_args': [
+ '--prefix', 'cutils/',
+ ],
+ },
+ 'includes': [
+ '../../build/shim_headers.gypi',
+ ],
+ }, {
+ 'type': 'static_library',
+ 'sources': [
+ 'ashmem.h',
+ 'ashmem-dev.c'
+ ],
+ }],
],
},
],
« no previous file with comments | « third_party/ashmem/OWNERS ('k') | tools/generate_shim_headers/generate_shim_headers.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698