Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(926)

Side by Side Diff: build/all.gyp

Issue 655723003: [Android] Don't use zip pushing if not built or on user builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/android/pylib/device/commands/install_commands.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests ', 759 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests ',
760 '../base/base.gyp:base_unittests', 760 '../base/base.gyp:base_unittests',
761 '../breakpad/breakpad.gyp:breakpad_unittests_stripped', 761 '../breakpad/breakpad.gyp:breakpad_unittests_stripped',
762 # Also compile the tools needed to deal with minidumps, they are 762 # Also compile the tools needed to deal with minidumps, they are
763 # needed to run minidump tests upstream. 763 # needed to run minidump tests upstream.
764 '../breakpad/breakpad.gyp:dump_syms#host', 764 '../breakpad/breakpad.gyp:dump_syms#host',
765 '../breakpad/breakpad.gyp:symupload#host', 765 '../breakpad/breakpad.gyp:symupload#host',
766 '../breakpad/breakpad.gyp:minidump_dump#host', 766 '../breakpad/breakpad.gyp:minidump_dump#host',
767 '../breakpad/breakpad.gyp:minidump_stackwalk#host', 767 '../breakpad/breakpad.gyp:minidump_stackwalk#host',
768 '../build/android/tests/multiple_proguards/multiple_proguards.gyp:mu ltiple_proguards_test_apk', 768 '../build/android/tests/multiple_proguards/multiple_proguards.gyp:mu ltiple_proguards_test_apk',
769 '../build/android/pylib/device/commands/commands.gyp:chromium_comman ds',
769 '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests', 770 '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests',
770 '../cc/cc_tests.gyp:cc_perftests_apk', 771 '../cc/cc_tests.gyp:cc_perftests_apk',
771 '../cc/cc_tests.gyp:cc_unittests', 772 '../cc/cc_tests.gyp:cc_unittests',
772 '../chrome/chrome.gyp:unit_tests', 773 '../chrome/chrome.gyp:unit_tests',
773 '../components/components_tests.gyp:components_unittests', 774 '../components/components_tests.gyp:components_unittests',
774 '../content/content_shell_and_tests.gyp:content_browsertests', 775 '../content/content_shell_and_tests.gyp:content_browsertests',
775 '../content/content_shell_and_tests.gyp:content_gl_tests', 776 '../content/content_shell_and_tests.gyp:content_gl_tests',
776 '../content/content_shell_and_tests.gyp:chromium_linker_test_apk', 777 '../content/content_shell_and_tests.gyp:chromium_linker_test_apk',
777 '../content/content_shell_and_tests.gyp:content_shell_test_apk', 778 '../content/content_shell_and_tests.gyp:content_shell_test_apk',
778 '../content/content_shell_and_tests.gyp:content_unittests', 779 '../content/content_shell_and_tests.gyp:content_unittests',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 '../ui/base/ui_base_tests.gyp:ui_unittests_apk', 824 '../ui/base/ui_base_tests.gyp:ui_unittests_apk',
824 '../ui/events/events.gyp:events_unittests_apk', 825 '../ui/events/events.gyp:events_unittests_apk',
825 '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', 826 '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
826 ], 827 ],
827 }, 828 },
828 { 829 {
829 # WebRTC Chromium tests to run on Android. 830 # WebRTC Chromium tests to run on Android.
830 'target_name': 'android_builder_chromium_webrtc', 831 'target_name': 'android_builder_chromium_webrtc',
831 'type': 'none', 832 'type': 'none',
832 'dependencies': [ 833 'dependencies': [
834 '../build/android/pylib/device/commands/commands.gyp:chromium_comman ds',
833 '../content/content_shell_and_tests.gyp:content_browsertests', 835 '../content/content_shell_and_tests.gyp:content_browsertests',
834 '../tools/android/android_tools.gyp:android_tools', 836 '../tools/android/android_tools.gyp:android_tools',
835 '../tools/android/android_tools.gyp:memconsumer', 837 '../tools/android/android_tools.gyp:memconsumer',
836 # Unit test bundles packaged as an apk. 838 # Unit test bundles packaged as an apk.
837 '../content/content_shell_and_tests.gyp:content_browsertests_apk', 839 '../content/content_shell_and_tests.gyp:content_browsertests_apk',
838 ], 840 ],
839 'conditions': [ 841 'conditions': [
840 ['"<(libpeer_target_type)"=="static_library"', { 842 ['"<(libpeer_target_type)"=="static_library"', {
841 'dependencies': [ 843 'dependencies': [
842 '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection _javalib', 844 '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection _javalib',
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 'dependencies': [ 1332 'dependencies': [
1331 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1333 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1332 '../ui/views/views.gyp:views', 1334 '../ui/views/views.gyp:views',
1333 '../ui/views/views.gyp:views_unittests', 1335 '../ui/views/views.gyp:views_unittests',
1334 ], 1336 ],
1335 }, # target_name: macviews_builder 1337 }, # target_name: macviews_builder
1336 ], # targets 1338 ], # targets
1337 }], # os=='mac' and toolkit_views==1 1339 }], # os=='mac' and toolkit_views==1
1338 ], # conditions 1340 ], # conditions
1339 } 1341 }
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/device/commands/install_commands.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698