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

Side by Side Diff: build/all.gyp

Issue 719453005: Resolving build issue while disabling webrtc for android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated the patch Created 6 years, 1 month 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 | no next file » | 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 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk', 837 '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk',
838 '../sql/sql.gyp:sql_unittests_apk', 838 '../sql/sql.gyp:sql_unittests_apk',
839 '../sync/sync.gyp:sync_unit_tests_apk', 839 '../sync/sync.gyp:sync_unit_tests_apk',
840 '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unit tests_apk', 840 '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unit tests_apk',
841 '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk', 841 '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk',
842 '../ui/base/ui_base_tests.gyp:ui_unittests_apk', 842 '../ui/base/ui_base_tests.gyp:ui_unittests_apk',
843 '../ui/events/events.gyp:events_unittests_apk', 843 '../ui/events/events.gyp:events_unittests_apk',
844 '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', 844 '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
845 ], 845 ],
846 'conditions': [ 846 'conditions': [
847 ['"<(libpeer_target_type)"=="static_library"', { 847 ['enable_webrtc==1 and "<(libpeer_target_type)"=="static_library"', {
848 'dependencies': [ 848 'dependencies': [
849 '../components/devtools_bridge.gyp:devtools_bridge_tests_apk', 849 '../components/devtools_bridge.gyp:devtools_bridge_tests_apk',
850 '../components/devtools_bridge.gyp:devtools_bridge_tests2_apk', 850 '../components/devtools_bridge.gyp:devtools_bridge_tests2_apk',
851 ], 851 ],
852 }], 852 }],
853 ], 853 ],
854 }, 854 },
855 { 855 {
856 # WebRTC Chromium tests to run on Android. 856 # WebRTC Chromium tests to run on Android.
857 'target_name': 'android_builder_chromium_webrtc', 857 'target_name': 'android_builder_chromium_webrtc',
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
1362 'dependencies': [ 1362 'dependencies': [
1363 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1363 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1364 '../ui/views/views.gyp:views', 1364 '../ui/views/views.gyp:views',
1365 '../ui/views/views.gyp:views_unittests', 1365 '../ui/views/views.gyp:views_unittests',
1366 ], 1366 ],
1367 }, # target_name: macviews_builder 1367 }, # target_name: macviews_builder
1368 ], # targets 1368 ], # targets
1369 }], # os=='mac' and toolkit_views==1 1369 }], # os=='mac' and toolkit_views==1
1370 ], # conditions 1370 ], # conditions
1371 } 1371 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698