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

Side by Side Diff: build/all.gyp

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: final patch? Created 5 years, 7 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 | chrome/android/chrome_apk.gyp » ('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'. 8 # compilation targets to 'All'.
9 'app_targets%': [], 9 'app_targets%': [],
10 # For Android-specific targets. 10 # For Android-specific targets.
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 # See http://crbug.com/159203 80 # See http://crbug.com/159203
81 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_javalib', 81 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_javalib',
82 ], 82 ],
83 'conditions': [ 83 'conditions': [
84 ['chromecast==0', { 84 ['chromecast==0', {
85 'dependencies': [ 85 'dependencies': [
86 '../android_webview/android_webview.gyp:android_webview_apk', 86 '../android_webview/android_webview.gyp:android_webview_apk',
87 '../android_webview/android_webview.gyp:system_webview_apk', 87 '../android_webview/android_webview.gyp:system_webview_apk',
88 '../android_webview/android_webview_shell.gyp:android_webview_sh ell_apk', 88 '../android_webview/android_webview_shell.gyp:android_webview_sh ell_apk',
89 '../android_webview/android_webview_telemetry_shell.gyp:android_ webview_telemetry_shell_apk', 89 '../android_webview/android_webview_telemetry_shell.gyp:android_ webview_telemetry_shell_apk',
90 '../chrome/android/chrome_apk.gyp:chrome_public_apk',
90 '../chrome/chrome.gyp:chrome_shell_apk', 91 '../chrome/chrome.gyp:chrome_shell_apk',
91 '../chrome/chrome.gyp:chrome_sync_shell_apk', 92 '../chrome/chrome.gyp:chrome_sync_shell_apk',
92 '../remoting/remoting.gyp:remoting_apk', 93 '../remoting/remoting.gyp:remoting_apk',
93 ], 94 ],
94 }], 95 }],
95 ['target_arch == "arm" or target_arch == "arm64"', { 96 ['target_arch == "arm" or target_arch == "arm64"', {
96 'dependencies': [ 97 'dependencies': [
97 # The relocation packer only works on ARM or ARM64. 98 # The relocation packer only works on ARM or ARM64.
98 '../tools/relocation_packer/relocation_packer.gyp:relocation_pac ker_unittests#host', 99 '../tools/relocation_packer/relocation_packer.gyp:relocation_pac ker_unittests#host',
99 ], 100 ],
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_uni ttests_apk', 870 '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_uni ttests_apk',
870 ], 871 ],
871 'conditions': [ 872 'conditions': [
872 ['chromecast==0', { 873 ['chromecast==0', {
873 'dependencies': [ 874 'dependencies': [
874 '../android_webview/android_webview.gyp:android_webview_unittest s', 875 '../android_webview/android_webview.gyp:android_webview_unittest s',
875 '../chrome/chrome.gyp:unit_tests', 876 '../chrome/chrome.gyp:unit_tests',
876 # Unit test bundles packaged as an apk. 877 # Unit test bundles packaged as an apk.
877 '../android_webview/android_webview.gyp:android_webview_test_apk ', 878 '../android_webview/android_webview.gyp:android_webview_test_apk ',
878 '../android_webview/android_webview.gyp:android_webview_unittest s_apk', 879 '../android_webview/android_webview.gyp:android_webview_unittest s_apk',
880 '../chrome/android/chrome_apk.gyp:chrome_public_test_apk',
879 '../chrome/chrome.gyp:chrome_junit_tests', 881 '../chrome/chrome.gyp:chrome_junit_tests',
880 '../chrome/chrome.gyp:chrome_shell_test_apk', 882 '../chrome/chrome.gyp:chrome_shell_test_apk',
881 '../chrome/chrome.gyp:chrome_sync_shell_test_apk', 883 '../chrome/chrome.gyp:chrome_sync_shell_test_apk',
882 '../chrome/chrome.gyp:chrome_shell_uiautomator_tests', 884 '../chrome/chrome.gyp:chrome_shell_uiautomator_tests',
883 '../chrome/chrome.gyp:chromedriver_webview_shell_apk', 885 '../chrome/chrome.gyp:chromedriver_webview_shell_apk',
884 '../chrome/chrome.gyp:unit_tests_apk', 886 '../chrome/chrome.gyp:unit_tests_apk',
885 ], 887 ],
886 }], 888 }],
887 ], 889 ],
888 }, 890 },
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
1397 'dependencies': [ 1399 'dependencies': [
1398 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1400 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1399 '../ui/views/views.gyp:views', 1401 '../ui/views/views.gyp:views',
1400 '../ui/views/views.gyp:views_unittests', 1402 '../ui/views/views.gyp:views_unittests',
1401 ], 1403 ],
1402 }, # target_name: macviews_builder 1404 }, # target_name: macviews_builder
1403 ], # targets 1405 ], # targets
1404 }], # os=='mac' and toolkit_views==1 1406 }], # os=='mac' and toolkit_views==1
1405 ], # conditions 1407 ], # conditions
1406 } 1408 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/chrome_apk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698