Commit 3acfbb2b authored by torne's avatar torne Committed by Commit bot

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}
parent faf50c40
...@@ -52,7 +52,6 @@ KNOWN_INCOMPATIBLE = { ...@@ -52,7 +52,6 @@ KNOWN_INCOMPATIBLE = {
# Code we don't want to build/include by accident from the main chromium # Code we don't want to build/include by accident from the main chromium
# src/ directory. # src/ directory.
'third_party/ashmem/*.[ch]',
'third_party/libjpeg/*.[ch]', 'third_party/libjpeg/*.[ch]',
], ],
'third_party/icu': [ 'third_party/icu': [
......
...@@ -4,19 +4,9 @@ ...@@ -4,19 +4,9 @@
assert(is_android) assert(is_android)
import("//build/config/android/config.gni") source_set("ashmem") {
sources = [
if (is_android_webview_build) { "ashmem.h",
# WebView build uses the Android system version of ashmem to avoid linking "ashmem-dev.c",
# problems. ]
group("ashmem") {
assert(false, "Implement system ashmem for webview build")
}
} else {
source_set("ashmem") {
sources = [
"ashmem.h",
"ashmem-dev.c",
]
}
} }
...@@ -6,33 +6,10 @@ ...@@ -6,33 +6,10 @@
'targets': [ 'targets': [
{ {
'target_name': 'ashmem', 'target_name': 'ashmem',
'conditions': [ 'type': 'static_library',
['android_webview_build==1', { 'sources': [
# WebView must use the Android system version of ashmem to avoid 'ashmem.h',
# linking problems. 'ashmem-dev.c'
'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'
],
}],
], ],
}, },
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment