| Index: third_party/ashmem/ashmem.gyp
|
| diff --git a/third_party/ashmem/ashmem.gyp b/third_party/ashmem/ashmem.gyp
|
| index 4b248c54871fc15fac45db83a2aebe2c117547fb..e26ac18f5822fcf628b95a9d86d1e34d92821cb5 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'
|
| ],
|
| },
|
| ],
|
|
|