diff options
| author | torne <torne@chromium.org> | 2014-09-09 03:49:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-09 10:51:09 +0000 |
| commit | 3acfbb2b8bed0d78aa4af78c5e34e289122b79e5 (patch) | |
| tree | 48b083cdab1168f0600675c5517e5f7a3dd9f1af /third_party/ashmem | |
| parent | faf50c40335fd2055c8beed69c0f630bd442d880 (diff) | |
| download | chromium_src-3acfbb2b8bed0d78aa4af78c5e34e289122b79e5.zip chromium_src-3acfbb2b8bed0d78aa4af78c5e34e289122b79e5.tar.gz chromium_src-3acfbb2b8bed0d78aa4af78c5e34e289122b79e5.tar.bz2 | |
android_webview: stop using system ashmem.
To support unbundled updates we need to stop depending on system
libraries. Disable using the system ashmem APIs in libcutils and instead
link Chromium's copy, and remove support for using the version in
libcutils as there are no other users.
This increases binary size by <1KB.
BUG=409851
Review URL: https://codereview.chromium.org/550213002
Cr-Commit-Position: refs/heads/master@{#293916}
Diffstat (limited to 'third_party/ashmem')
| -rw-r--r-- | third_party/ashmem/BUILD.gn | 20 | ||||
| -rw-r--r-- | third_party/ashmem/ashmem.gyp | 31 |
2 files changed, 9 insertions, 42 deletions
diff --git a/third_party/ashmem/BUILD.gn b/third_party/ashmem/BUILD.gn index 7266e65..a3f7e6a 100644 --- a/third_party/ashmem/BUILD.gn +++ b/third_party/ashmem/BUILD.gn @@ -4,19 +4,9 @@ assert(is_android) -import("//build/config/android/config.gni") - -if (is_android_webview_build) { - # WebView build uses the Android system version of ashmem to avoid linking - # problems. - group("ashmem") { - assert(false, "Implement system ashmem for webview build") - } -} else { - source_set("ashmem") { - sources = [ - "ashmem.h", - "ashmem-dev.c", - ] - } +source_set("ashmem") { + sources = [ + "ashmem.h", + "ashmem-dev.c", + ] } diff --git a/third_party/ashmem/ashmem.gyp b/third_party/ashmem/ashmem.gyp index 4b248c5..e26ac18 100644 --- a/third_party/ashmem/ashmem.gyp +++ b/third_party/ashmem/ashmem.gyp @@ -6,33 +6,10 @@ 'targets': [ { 'target_name': 'ashmem', - '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', - ], - 'link_settings': { - 'libraries': [ - '-lcutils', - ], - }, - }, { - 'type': 'static_library', - 'sources': [ - 'ashmem.h', - 'ashmem-dev.c' - ], - }], + 'type': 'static_library', + 'sources': [ + 'ashmem.h', + 'ashmem-dev.c' ], }, ], |