diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 15:52:47 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 15:52:47 +0000 |
| commit | bb6bd1f3beed051238f36bd0fca9014ebfa9bffc (patch) | |
| tree | 7eec7720e77f0a739fb4cbf44ff8908d0f3cd68a /base/base.gyp | |
| parent | 0603f9c107f4c5511a870bbc8f6b5954124944f0 (diff) | |
| download | chromium_src-bb6bd1f3beed051238f36bd0fca9014ebfa9bffc.zip chromium_src-bb6bd1f3beed051238f36bd0fca9014ebfa9bffc.tar.gz chromium_src-bb6bd1f3beed051238f36bd0fca9014ebfa9bffc.tar.bz2 | |
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
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 6 |
1 files changed, 5 insertions, 1 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': [ |