Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2506)

Unified Diff: base/base.gyp

Issue 1010653003: Remove android_webview_build conditions from base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/android/linker/BUILD.gn ('k') | base/base.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index ac37a890496cde6254ba16e8c498dba06198c3ea..f8d77654e910d386fdbf4d1326b0ed921d60ab39 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -103,6 +103,7 @@
}],
],
'dependencies': [
+ 'base_java',
'base_jni_headers',
'../third_party/ashmem/ashmem.gyp:ashmem',
],
@@ -118,11 +119,6 @@
'../build/android/cpufeatures.gypi',
],
}],
- ['OS == "android" and _toolset == "target" and android_webview_build == 0', {
- 'dependencies': [
- 'base_java',
- ],
- }],
['os_bsd==1', {
'include_dirs': [
'/usr/local/include',
@@ -1412,15 +1408,9 @@
'base_java_library_process_type',
'base_java_memory_pressure_level',
'base_native_libraries_gen',
+ '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
],
'includes': [ '../build/java.gypi' ],
- 'conditions': [
- ['android_webview_build==0', {
- 'dependencies': [
- '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
- ],
- }]
- ],
},
{
# GN: //base:base_java_unittest_support
@@ -1490,25 +1480,18 @@
# GN: //base/android/linker:chromium_android_linker
'target_name': 'chromium_android_linker',
'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': [
- 'android/linker/linker_jni.cc',
- ],
- # The crazy linker is never instrumented.
- 'cflags!': [
- '-finstrument-functions',
- ],
- 'dependencies': [
- # The NDK contains the crazy_linker here:
- # '<(android_ndk_root)/crazy_linker.gyp:crazy_linker'
- # However, we use our own fork. See bug 384700.
- '../third_party/android_crazy_linker/crazy_linker.gyp:crazy_linker',
- ],
- }],
+ 'sources': [
+ 'android/linker/linker_jni.cc',
+ ],
+ # The crazy linker is never instrumented.
+ 'cflags!': [
+ '-finstrument-functions',
+ ],
+ 'dependencies': [
+ # The NDK contains the crazy_linker here:
+ # '<(android_ndk_root)/crazy_linker.gyp:crazy_linker'
+ # However, we use our own fork. See bug 384700.
+ '../third_party/android_crazy_linker/crazy_linker.gyp:crazy_linker',
],
},
{
« no previous file with comments | « base/android/linker/BUILD.gn ('k') | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698