From bb6bd1f3beed051238f36bd0fca9014ebfa9bffc Mon Sep 17 00:00:00 2001 From: "pliard@chromium.org" Date: Mon, 10 Sep 2012 15:52:47 +0000 Subject: 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 --- media/media.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'media') 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', -- cgit v1.1