summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/base.gyp6
-rw-r--r--build/apk_test.gypi5
-rw-r--r--chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi2
-rw-r--r--chrome/chrome.gyp6
-rw-r--r--content/content.gyp8
-rw-r--r--content/content_tests.gypi4
-rw-r--r--gpu/gpu_common.gypi1
-rw-r--r--ipc/ipc.gyp1
-rw-r--r--media/media.gyp4
-rw-r--r--net/net.gyp18
-rw-r--r--sql/sql.gyp1
-rw-r--r--sync/sync.gyp1
-rw-r--r--ui/ui_unittests.gypi1
13 files changed, 33 insertions, 25 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 643836c..6384ac9 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -122,10 +122,11 @@
}],
],
'dependencies': [
+ 'base_java',
+ 'base_jni_headers',
'symbolize',
'../third_party/ashmem/ashmem.gyp:ashmem',
'../third_party/icu/icu.gyp:icuuc',
- 'base_jni_headers',
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/base',
@@ -141,6 +142,9 @@
'sources!': [
'debug/stack_trace_posix.cc',
],
+ 'export_dependent_settings': [
+ 'base_java',
+ ],
}],
['os_bsd==1', {
'include_dirs': [
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 68ac239..4f6d5c8 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -20,7 +20,10 @@
{
'variables': {
- 'input_jars_paths': [],
+ 'input_jars_paths': [
+ # Needed by ChromeNativeTestActivity.java.
+ '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
+ ],
},
'target_conditions': [
['_toolset == "target"', {
diff --git a/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi b/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi
index 6fa8652..ad15c3f 100644
--- a/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi
+++ b/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.gypi
@@ -34,7 +34,7 @@
'target_name': 'web_contents_delegate_android_java',
'type': 'none',
'dependencies': [
- '<(DEPTH)/base/base.gyp:base_java',
+ '<(DEPTH)/base/base.gyp:base',
],
'variables': {
'package_name': 'web_contents_delegate_android',
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index f58575b..b4fab76 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1077,16 +1077,14 @@
'target_name': 'chrome_java',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
+ '../base/base.gyp:base',
'../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
'../content/content.gyp:content_java',
- '../net/net.gyp:net_java',
],
'export_dependent_settings': [
- '../base/base.gyp:base_java',
+ '../base/base.gyp:base',
'../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
'../content/content.gyp:content_java',
- '../net/net.gyp:net_java',
],
'variables': {
'package_name': 'chrome',
diff --git a/content/content.gyp b/content/content.gyp
index 50b8e0f..168089b 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -280,14 +280,14 @@
'target_name': 'content_java',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
- '../net/net.gyp:net_java',
+ '../base/base.gyp:base',
+ '../net/net.gyp:net',
'common_aidl',
'content_common',
],
'export_dependent_settings': [
- '../base/base.gyp:base_java',
- '../net/net.gyp:net_java',
+ '../base/base.gyp:base',
+ '../net/net.gyp:net',
],
'variables': {
'package_name': 'content',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index a55e0d2..68ff046 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -787,8 +787,6 @@
'target_name': 'content_unittests_apk',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
- '../net/net.gyp:net_java',
'content_java',
'content_unittests',
],
@@ -806,7 +804,7 @@
'target_name': 'content_javatests',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
+ '../base/base.gyp:base',
'../base/base.gyp:base_java_test_support',
'content_common',
'content_java',
diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi
index 0da2a25..4402e0b 100644
--- a/gpu/gpu_common.gypi
+++ b/gpu/gpu_common.gypi
@@ -40,7 +40,6 @@
'target_name': 'gpu_unittests_apk',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
'gpu_unittests',
],
'variables': {
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index f7af7d99..6e9bd9e 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -132,7 +132,6 @@
'target_name': 'ipc_tests_apk',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
'ipc_tests',
],
'variables': {
diff --git a/media/media.gyp b/media/media.gyp
index 3cfcc2e..2c5ec9c 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1159,10 +1159,10 @@
'target_name': 'media_java',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
+ '../base/base.gyp:base',
],
'export_dependent_settings': [
- '../base/base.gyp:base_java',
+ '../base/base.gyp:base',
],
'variables': {
'package_name': 'media',
diff --git a/net/net.gyp b/net/net.gyp
index a5b1cba..33872dc 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1111,6 +1111,14 @@
],
},
],
+ ['OS=="android" and _toolset=="target"', {
+ 'dependencies': [
+ 'net_java',
+ ],
+ 'export_dependent_settings': [
+ 'net_java',
+ ],
+ }],
[ 'OS == "android"', {
'dependencies': [
'../third_party/openssl/openssl.gyp:openssl',
@@ -2102,10 +2110,10 @@
'java_in_dir': '../net/android/java',
},
'dependencies': [
- '../base/base.gyp:base_java',
+ '../base/base.gyp:base',
],
'export_dependent_settings': [
- '../base/base.gyp:base_java',
+ '../base/base.gyp:base',
],
'includes': [ '../build/java.gypi' ],
},
@@ -2117,12 +2125,14 @@
'java_in_dir': '../net/android/javatests',
},
'dependencies': [
- '../base/base.gyp:base_java',
+ '../base/base.gyp:base',
'../base/base.gyp:base_java_test_support',
+ 'net_java',
],
'export_dependent_settings': [
- '../base/base.gyp:base_java',
+ '../base/base.gyp:base',
'../base/base.gyp:base_java_test_support',
+ 'net_java',
],
'includes': [ '../build/java.gypi' ],
},
diff --git a/sql/sql.gyp b/sql/sql.gyp
index 8d8a028..72d361c 100644
--- a/sql/sql.gyp
+++ b/sql/sql.gyp
@@ -73,7 +73,6 @@
'target_name': 'sql_unittests_apk',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
'sql_unittests',
],
'variables': {
diff --git a/sync/sync.gyp b/sync/sync.gyp
index decc13c..1e21ad4 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -872,7 +872,6 @@
'target_name': 'sync_unit_tests_apk',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
'sync_unit_tests',
],
'variables': {
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 2b3fd38..17088c2 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -260,7 +260,6 @@
'target_name': 'ui_unittests_apk',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
'ui_unittests',
],
'variables': {