diff options
| author | cjhopman <cjhopman@chromium.org> | 2014-09-09 01:55:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-09 08:58:14 +0000 |
| commit | 394dfd1052e53e64083daef7cc66055557256dcb (patch) | |
| tree | 732ab90590a2c25f9804404696a521dace44809a /media/media.gyp | |
| parent | 92516216d2dc3ce3ab3a56500126dc2dcd54e746 (diff) | |
| download | chromium_src-394dfd1052e53e64083daef7cc66055557256dcb.zip chromium_src-394dfd1052e53e64083daef7cc66055557256dcb.tar.gz chromium_src-394dfd1052e53e64083daef7cc66055557256dcb.tar.bz2 | |
Add content_shell_test_apk and several dependencies
This adds support for android_apk targets without any java included
directly in the target (only included through deps).
This adds the following targets:
//base:base_javatests
//content/public/android:content_javatests
//content/shell/android:content_shell_test_apk
//media/android:media_android_imageformat_list (moved)
//media/android:media_java (moved+fixed)
BUG=359249
Review URL: https://codereview.chromium.org/525533003
Cr-Commit-Position: refs/heads/master@{#293897}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index 5fb0366..355312e 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1620,6 +1620,7 @@ ['OS=="android"', { 'targets': [ { + # TODO(GN) 'target_name': 'media_unittests_apk', 'type': 'none', 'dependencies': [ @@ -1632,6 +1633,7 @@ 'includes': ['../build/apk_test.gypi'], }, { + # TODO(GN) 'target_name': 'media_perftests_apk', 'type': 'none', 'dependencies': [ @@ -1644,6 +1646,7 @@ 'includes': ['../build/apk_test.gypi'], }, { + # GN: //media/base/android:media_android_jni_headers 'target_name': 'media_android_jni_headers', 'type': 'none', 'sources': [ @@ -1663,6 +1666,7 @@ 'includes': ['../build/jni_generator.gypi'], }, { + # GN: //media/base/android:video_capture_android_jni_headers 'target_name': 'video_capture_android_jni_headers', 'type': 'none', 'sources': [ @@ -1675,6 +1679,7 @@ 'includes': ['../build/jni_generator.gypi'], }, { + # GN: //media/base/android:android 'target_name': 'player_android', 'type': 'static_library', 'sources': [ @@ -1720,6 +1725,7 @@ ], }, { + # GN: //media/base/android:media_java 'target_name': 'media_java', 'type': 'none', 'dependencies': [ @@ -1735,6 +1741,7 @@ 'includes': ['../build/java.gypi'], }, { + # GN: //media/base/android:media_android_imageformat_list 'target_name': 'media_android_imageformat_list', 'type': 'none', 'sources': [ |