diff options
author | Brett Wilson <brettw@chromium.org> | 2014-08-25 12:10:01 -0700 |
---|---|---|
committer | Brett Wilson <brettw@chromium.org> | 2014-08-25 19:11:32 +0000 |
commit | 1c693998d75f78e94862c324afba3815356ecaf1 (patch) | |
tree | e9eeb250ded43e757513a21fe3c92ada154c6b1b /components | |
parent | 8fbaaa3b0cde0b4a96ef105814e76b3d9ab0d430 (diff) | |
download | chromium_src-1c693998d75f78e94862c324afba3815356ecaf1.zip chromium_src-1c693998d75f78e94862c324afba3815356ecaf1.tar.gz chromium_src-1c693998d75f78e94862c324afba3815356ecaf1.tar.bz2 |
Add some remoting targets to GN build.
Since GN runs its scripts in a different current directory than GYP, I had to update the remoting html template script to be able to handle this situation.
Also includes many misc linking fixes:
- Sets enable_nacl to false.
- Add renderer context menu component
- Adds many missing files
R=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/498773005
Cr-Commit-Position: refs/heads/master@{#291731}
Diffstat (limited to 'components')
-rw-r--r-- | components/BUILD.gn | 2 | ||||
-rw-r--r-- | components/metrics/BUILD.gn | 10 | ||||
-rw-r--r-- | components/renderer_context_menu/BUILD.gn | 33 | ||||
-rw-r--r-- | components/translate/core/browser/BUILD.gn | 2 | ||||
-rw-r--r-- | components/variations.gypi | 1 | ||||
-rw-r--r-- | components/variations/BUILD.gn | 10 |
6 files changed, 54 insertions, 4 deletions
diff --git a/components/BUILD.gn b/components/BUILD.gn index 45d2db6..1d7eb13 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -64,6 +64,7 @@ group("all_components") { "//components/pref_registry", "//components/query_parser", "//components/rappor", + "//components/renderer_context_menu", "//components/resources:components_resources", "//components/search", "//components/search_engines", @@ -144,6 +145,7 @@ group("all_components") { "//components/precache/content", # Blocked on content. "//components/precache/core", # Should work, needs checking. "//components/rappor", # Should work, needs checking. + "//components/renderer_context_menu", # Blocked on content. "//components/search_engines", # Should work, needs checking. "//components/search_provider_logos", # Should work, needs checking. "//components/sessions", # Blocked on content. diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn index 689c0e8..fa44a9b 100644 --- a/components/metrics/BUILD.gn +++ b/components/metrics/BUILD.gn @@ -5,10 +5,12 @@ # GYP version: components/metrics.gypi:metrics source_set("metrics") { sources = [ - "compression_utils.cc", - "compression_utils.h", + "client_info.cc", + "client_info.h", "cloned_install_detector.cc", "cloned_install_detector.h", + "compression_utils.cc", + "compression_utils.h", "machine_id_provider.h", "machine_id_provider_stub.cc", "machine_id_provider_win.cc", @@ -16,10 +18,10 @@ source_set("metrics") { "metrics_hashes.h", "metrics_log.cc", "metrics_log.h", - "metrics_log_uploader.cc", - "metrics_log_uploader.h", "metrics_log_manager.cc", "metrics_log_manager.h", + "metrics_log_uploader.cc", + "metrics_log_uploader.h", "metrics_pref_names.cc", "metrics_pref_names.h", "metrics_provider.h", diff --git a/components/renderer_context_menu/BUILD.gn b/components/renderer_context_menu/BUILD.gn new file mode 100644 index 0000000..451c4ae --- /dev/null +++ b/components/renderer_context_menu/BUILD.gn @@ -0,0 +1,33 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ui.gni") + +static_library("renderer_context_menu") { + sources = [ + "context_menu_content_type.cc", + "context_menu_content_type.h", + "context_menu_delegate.cc", + "context_menu_delegate.h", + "render_view_context_menu_base.cc", + "render_view_context_menu_base.h", + "render_view_context_menu_observer.cc", + "render_view_context_menu_observer.h", + "render_view_context_menu_proxy.h", + ] + + if (toolkit_views) { + sources += [ + "views/toolkit_delegate_views.cc", + "views/toolkit_delegate_views.h", + ] + } + + deps = [ + "//base", + "//content/public/browser", + "//components/search_engines", + "//components/metrics/proto", + ] +} diff --git a/components/translate/core/browser/BUILD.gn b/components/translate/core/browser/BUILD.gn index f7a099a..5faca5bc 100644 --- a/components/translate/core/browser/BUILD.gn +++ b/components/translate/core/browser/BUILD.gn @@ -20,6 +20,8 @@ source_set("browser") { "translate_event_details.h", "translate_language_list.cc", "translate_language_list.h", + "translate_manager.cc", + "translate_manager.h", "translate_prefs.cc", "translate_prefs.h", "translate_script.cc", diff --git a/components/variations.gypi b/components/variations.gypi index edde257..34f7840 100644 --- a/components/variations.gypi +++ b/components/variations.gypi @@ -18,6 +18,7 @@ '../third_party/mt19937ar/mt19937ar.gyp:mt19937ar', ], 'sources': [ + # Note: sources list duplicated in GN build. 'variations/active_field_trials.cc', 'variations/active_field_trials.h', 'variations/android/component_jni_registrar.cc', diff --git a/components/variations/BUILD.gn b/components/variations/BUILD.gn index 827155cf6..53384c3 100644 --- a/components/variations/BUILD.gn +++ b/components/variations/BUILD.gn @@ -6,6 +6,10 @@ static_library("variations") { sources = [ "active_field_trials.cc", "active_field_trials.h", + "android/component_jni_registrar.cc", + "android/component_jni_registrar.h", + "android/variations_associated_data_android.cc", + "android/variations_associated_data_android.h", "caching_permuted_entropy_provider.cc", "caching_permuted_entropy_provider.h", "entropy_provider.cc", @@ -16,10 +20,16 @@ static_library("variations") { "pref_names.h", "processed_study.cc", "processed_study.h", + "proto/client_variations.proto", + "proto/permuted_entropy_cache.proto", + "proto/study.proto", + "proto/variations_seed.proto", "study_filtering.cc", "study_filtering.h", "variations_associated_data.cc", "variations_associated_data.h", + "variations_http_header_provider.cc", + "variations_http_header_provider.h", "variations_seed_processor.cc", "variations_seed_processor.h", "variations_seed_simulator.cc", |