Remove {base,net}_java dependencies from GYP client targets on Android.

On Android, some GYP client targets were explicitly depending on both the native and Java sides of a library. This removes the dependencies to {base,net}_java and make the native side ('base' and 'net) of these libraries depend on their Java counterpart. On Android it rarely makes sense to depend on a single side of a Java/C++ library. The {base,net}_java can now be considered as "private" targets although GYP does not support this concept unfortunately (AFAICT). Note that I made sure that the resulting APKs' size is unchanged. Additionally, this CL removes 'base_java' (i.e. does not replace it with 'base') from the targets including 'build/apk_test.gypi'. This dependency should not have been there (in the wrong layer) in the first place. It's needed by ChromeNativeTestActivity.java which clients should not know about. BUG=146323 TBR=lipalani,sky,willchan,brettw Review URL: https://chromiumcodereview.appspot.com/10913083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155737 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Sep 10, 2012 · bb6bd1f · bb6bd1f
1 parent 0603f9c
commit bb6bd1f
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -260,7 +260,6 @@
           'target_name': 'ui_unittests_apk',
           'type': 'none',
           'dependencies': [
-            '../base/base.gyp:base_java',
             'ui_unittests',
           ],
           'variables': {