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

Side by Side Diff: trunk/src/build/all.gyp

Issue 370633002: Revert 281286 "Add gyp machinery to build with packed ARM relati..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/build/android/gyp/pack_arm_relocations.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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 'dependencies': [ 47 'dependencies': [
48 '../content/content_shell_and_tests.gyp:content_shell_apk', 48 '../content/content_shell_and_tests.gyp:content_shell_apk',
49 '../mojo/mojo.gyp:mojo_shell_apk', 49 '../mojo/mojo.gyp:mojo_shell_apk',
50 '../mojo/mojo.gyp:mojo_test_apk', 50 '../mojo/mojo.gyp:mojo_test_apk',
51 '<@(android_app_targets)', 51 '<@(android_app_targets)',
52 'android_builder_tests', 52 'android_builder_tests',
53 '../android_webview/android_webview.gyp:android_webview_apk', 53 '../android_webview/android_webview.gyp:android_webview_apk',
54 '../chrome/chrome.gyp:chrome_shell_apk', 54 '../chrome/chrome.gyp:chrome_shell_apk',
55 '../remoting/remoting.gyp:remoting_apk', 55 '../remoting/remoting.gyp:remoting_apk',
56 '../tools/telemetry/telemetry.gyp:*#host', 56 '../tools/telemetry/telemetry.gyp:*#host',
57 '../tools/relocation_packer/relocation_packer.gyp:relocation_packer_ unittests#host',
58 # TODO(nyquist) This should instead by a target for sync when all of 57 # TODO(nyquist) This should instead by a target for sync when all of
59 # the sync-related code for Android has been upstreamed. 58 # the sync-related code for Android has been upstreamed.
60 # See http://crbug.com/159203 59 # See http://crbug.com/159203
61 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_javalib', 60 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_javalib',
62 ], 61 ],
63 }, { 62 }, {
64 'dependencies': [ 63 'dependencies': [
65 '../content/content_shell_and_tests.gyp:*', 64 '../content/content_shell_and_tests.gyp:*',
66 # TODO: This should build on Android and the target should move to t he list above. 65 # TODO: This should build on Android and the target should move to t he list above.
67 '../sync/sync.gyp:*', 66 '../sync/sync.gyp:*',
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 'dependencies': [ 1232 'dependencies': [
1234 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1233 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1235 '../ui/views/views.gyp:views', 1234 '../ui/views/views.gyp:views',
1236 '../ui/views/views.gyp:views_unittests', 1235 '../ui/views/views.gyp:views_unittests',
1237 ], 1236 ],
1238 }, # target_name: macviews_builder 1237 }, # target_name: macviews_builder
1239 ], # targets 1238 ], # targets
1240 }], # os=='mac' and toolkit_views==1 1239 }], # os=='mac' and toolkit_views==1
1241 ], # conditions 1240 ], # conditions
1242 } 1241 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/build/android/gyp/pack_arm_relocations.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698