diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 06:13:32 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 06:13:32 +0000 |
| commit | 88d14f03c8149590d0eb957d89085460d686e720 (patch) | |
| tree | f63b16c677ddc5aff5310b52f50dd754daf7c9eb | |
| parent | 337c269b56b74ef8acba33b9e249c01fe3214795 (diff) | |
| download | chromium_src-88d14f03c8149590d0eb957d89085460d686e720.zip chromium_src-88d14f03c8149590d0eb957d89085460d686e720.tar.gz chromium_src-88d14f03c8149590d0eb957d89085460d686e720.tar.bz2 | |
Android: native targets shouldn't depend on java targets.
The native targets for base/net/etc should not depend on the
base_java/net_java/etc targets, as they don't actually use the Java code
(only the JNI headers generated from them by
base_jni_headers/net_jni_headers/etc). Removing this dependency allows
the native code to be built without causing ant to run.
The targets which build Android APKs (like base_unittests_apk) already
depend on the Java targets.
Review URL: https://chromiumcodereview.appspot.com/10553036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142917 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/base.gyp | 1 | ||||
| -rw-r--r-- | content/content_browser.gypi | 1 | ||||
| -rw-r--r-- | media/media.gyp | 1 | ||||
| -rw-r--r-- | net/net.gyp | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/base/base.gyp b/base/base.gyp index 9c6849a..15e193e 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -125,7 +125,6 @@ 'symbolize', '../third_party/ashmem/ashmem.gyp:ashmem', '../third_party/icu/icu.gyp:icuuc', - 'base_java', 'base_jni_headers', ], 'include_dirs': [ diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 4d8dbd7..69149f8 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -852,7 +852,6 @@ 'dependencies': [ '../media/media.gyp:media', 'content.gyp:content_jni_headers', - 'content.gyp:content_java', ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/content', diff --git a/media/media.gyp b/media/media.gyp index 51e7215..498006e 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -954,7 +954,6 @@ ], 'dependencies': [ '../base/base.gyp:base', - 'media_java', ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/media', diff --git a/net/net.gyp b/net/net.gyp index 1b5bc93..bcbdd1e 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1000,7 +1000,6 @@ ], 'dependencies': [ '../third_party/openssl/openssl.gyp:openssl', - 'net_java', 'net_jni_headers', ], }, { # else OS! = "android" |