From 6c6361d31df0f6397092bba0659230bcad7ef88c Mon Sep 17 00:00:00 2001 From: "torne@chromium.org" Date: Tue, 26 Mar 2013 21:26:01 +0000 Subject: Android WebView: use the system ashmem. We are already pulling in the system ashmem via other system libraries, so compiling a second copy into chrome causes linker issues. Use the system version in Chromium as well when building WebView as part of the Android build. BUG=157326 Review URL: https://chromiumcodereview.appspot.com/12674026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190771 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/android_webview.gyp | 1 + android_webview/tools/known_issues.py | 1 + 2 files changed, 2 insertions(+) (limited to 'android_webview') diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 41f9898..0ce4bd7 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -29,6 +29,7 @@ # The "android" gyp backend doesn't quite handle static libraries' # dependencies correctly; force this to be linked as a workaround. 'cpufeatures.a', + '-lcutils', ], }], ], diff --git a/android_webview/tools/known_issues.py b/android_webview/tools/known_issues.py index 377950a..32bc1da 100644 --- a/android_webview/tools/known_issues.py +++ b/android_webview/tools/known_issues.py @@ -50,6 +50,7 @@ KNOWN_INCOMPATIBLE = { # Code we don't want to build/include by accident from the main chromium # src/ directory. + 'third_party/ashmem/*.[ch]', 'third_party/expat/files/lib', 'third_party/libjpeg/*.[ch]', ], -- cgit v1.1