diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-04 20:22:27 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-04 20:22:27 +0000 |
| commit | d38d27132afefb6fcd05643c1c3b4b4cc20f7d02 (patch) | |
| tree | 5c0979a2ccfc092adff0a5ee782f9bcd9be76184 /build | |
| parent | 99bc189b715a1c82ca0fcf52441d17a32676bf90 (diff) | |
| download | chromium_src-d38d27132afefb6fcd05643c1c3b4b4cc20f7d02.zip chromium_src-d38d27132afefb6fcd05643c1c3b4b4cc20f7d02.tar.gz chromium_src-d38d27132afefb6fcd05643c1c3b4b4cc20f7d02.tar.bz2 | |
Update build/all_android.gyp from downstream.
1) Adds android_app_targets for registering additional build targets
2) Adds breakpad_unittests
3) Sorts targets
Review URL: https://chromiumcodereview.appspot.com/10916071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all_android.gyp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp index 9cae82b..c3b103a 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -7,12 +7,18 @@ # into all.gyp. { + 'variables': { + # A hook that can be overridden in other repositories to add additional + # compilation targets to 'All' + 'android_app_targets%': [], + }, 'targets': [ { 'target_name': 'All', 'type': 'none', 'dependencies': [ '../content/content.gyp:content_shell_apk', + '<@(android_app_targets)', 'android_builder_tests', ], }, # target_name: All @@ -28,12 +34,14 @@ 'target_name': 'android_builder_tests', 'type': 'none', 'dependencies': [ + '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests', '../base/base.gyp:base_unittests', '../chrome/chrome.gyp:unit_tests', '../content/content.gyp:content_shell_test_apk', '../content/content.gyp:content_unittests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', + '../media/media.gyp:media_unittests', '../net/net.gyp:net_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', @@ -45,7 +53,6 @@ '../ui/ui.gyp:ui_unittests', # From here down: not added to run_tests.py yet. '../jingle/jingle.gyp:jingle_unittests', - '../media/media.gyp:media_unittests', # Required by ui_unittests. # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but # this would cause circular gyp dependency which needs refactoring the @@ -53,6 +60,11 @@ '../chrome/chrome_resources.gyp:packed_resources', ], 'conditions': [ + ['linux_breakpad==1', { + 'dependencies': [ + '../breakpad/breakpad.gyp:breakpad_unittests', + ], + }], ['"<(gtest_target_type)"=="shared_library"', { 'dependencies': [ # The first item is simply the template. We add as a dep @@ -62,8 +74,8 @@ '../testing/android/native_test.gyp:native_test_apk', # Unit test bundles packaged as an apk. '../base/base.gyp:base_unittests_apk', - '../content/content.gyp:content_unittests_apk', '../chrome/chrome.gyp:unit_tests_apk', + '../content/content.gyp:content_unittests_apk', '../gpu/gpu.gyp:gpu_unittests_apk', '../ipc/ipc.gyp:ipc_tests_apk', '../media/media.gyp:media_unittests_apk', |