Commit 7aba6ac8 authored by torne's avatar torne Committed by Commit bot

Remove android_webview_build conditions from base.

Remove references to android_webview_build now that we no longer support
that build configuration. Fold all conditions into the general
OS==android sections.

BUG=440793

Review URL: https://codereview.chromium.org/1010653003

Cr-Commit-Position: refs/heads/master@{#322087}
parent d68755a4
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
import("//build/config/android/config.gni") import("//build/config/android/config.gni")
assert(is_android) assert(is_android)
assert(!is_android_webview_build)
# GYP: //base/base.gyp:chromium_android_linker # GYP: //base/base.gyp:chromium_android_linker
shared_library("chromium_android_linker") { shared_library("chromium_android_linker") {
......
...@@ -103,6 +103,7 @@ ...@@ -103,6 +103,7 @@
}], }],
], ],
'dependencies': [ 'dependencies': [
'base_java',
'base_jni_headers', 'base_jni_headers',
'../third_party/ashmem/ashmem.gyp:ashmem', '../third_party/ashmem/ashmem.gyp:ashmem',
], ],
...@@ -118,11 +119,6 @@ ...@@ -118,11 +119,6 @@
'../build/android/cpufeatures.gypi', '../build/android/cpufeatures.gypi',
], ],
}], }],
['OS == "android" and _toolset == "target" and android_webview_build == 0', {
'dependencies': [
'base_java',
],
}],
['os_bsd==1', { ['os_bsd==1', {
'include_dirs': [ 'include_dirs': [
'/usr/local/include', '/usr/local/include',
...@@ -1412,15 +1408,9 @@ ...@@ -1412,15 +1408,9 @@
'base_java_library_process_type', 'base_java_library_process_type',
'base_java_memory_pressure_level', 'base_java_memory_pressure_level',
'base_native_libraries_gen', 'base_native_libraries_gen',
],
'includes': [ '../build/java.gypi' ],
'conditions': [
['android_webview_build==0', {
'dependencies': [
'../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
], ],
}] 'includes': [ '../build/java.gypi' ],
],
}, },
{ {
# GN: //base:base_java_unittest_support # GN: //base:base_java_unittest_support
...@@ -1490,11 +1480,6 @@ ...@@ -1490,11 +1480,6 @@
# GN: //base/android/linker:chromium_android_linker # GN: //base/android/linker:chromium_android_linker
'target_name': 'chromium_android_linker', 'target_name': 'chromium_android_linker',
'type': 'shared_library', 'type': 'shared_library',
'conditions': [
# Avoid breaking the webview build because it
# does not have <(android_ndk_root)/crazy_linker.gyp.
# Note that webview never uses the linker anyway.
['android_webview_build == 0', {
'sources': [ 'sources': [
'android/linker/linker_jni.cc', 'android/linker/linker_jni.cc',
], ],
...@@ -1508,8 +1493,6 @@ ...@@ -1508,8 +1493,6 @@
# However, we use our own fork. See bug 384700. # However, we use our own fork. See bug 384700.
'../third_party/android_crazy_linker/crazy_linker.gyp:crazy_linker', '../third_party/android_crazy_linker/crazy_linker.gyp:crazy_linker',
], ],
}],
],
}, },
{ {
# TODO(GN) # TODO(GN)
......
...@@ -836,13 +836,6 @@ ...@@ -836,13 +836,6 @@
['include', '^threading/platform_thread_linux\\.cc$'], ['include', '^threading/platform_thread_linux\\.cc$'],
], ],
}], }],
['OS == "android" and <(android_webview_build)==1', {
'defines': [
# WebView builds as part of the system which already has sincos;
# avoid defining it again as it causes a linker warning.
'ANDROID_SINCOS_PROVIDED',
],
}],
['<(chromeos) == 1', { ['<(chromeos) == 1', {
'sources!': [ 'sources!': [
'power_monitor/power_monitor_device_source_posix.cc', 'power_monitor/power_monitor_device_source_posix.cc',
......
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