diff options
author | pkotwicz <pkotwicz@chromium.org> | 2015-11-24 19:52:20 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-25 03:53:06 +0000 |
commit | 9ae3420e37bfb6c2878b0d036db01af0d16af067 (patch) | |
tree | a946f75b919a3575f72c0ac4a1582aba4787dd4a /sync/protocol | |
parent | b81447781b75fcab4338168b292f01d4c9543892 (diff) | |
download | chromium_src-9ae3420e37bfb6c2878b0d036db01af0d16af067.zip chromium_src-9ae3420e37bfb6c2878b0d036db01af0d16af067.tar.gz chromium_src-9ae3420e37bfb6c2878b0d036db01af0d16af067.tar.bz2 |
Port ChromeSyncShell build rules to GN
BUG=475612
R=agrieve, newt, pvalenzuela, zea
TBR=brettw for .gn whitelisting usage fo gypi_to_gn in protocol_sources.gni
Review URL: https://codereview.chromium.org/1458353002
Cr-Commit-Position: refs/heads/master@{#361561}
Diffstat (limited to 'sync/protocol')
-rw-r--r-- | sync/protocol/BUILD.gn | 45 | ||||
-rw-r--r-- | sync/protocol/protocol.gypi | 3 | ||||
-rw-r--r-- | sync/protocol/protocol_sources.gni | 14 |
3 files changed, 16 insertions, 46 deletions
diff --git a/sync/protocol/BUILD.gn b/sync/protocol/BUILD.gn index 0fefbc5..f90ae70 100644 --- a/sync/protocol/BUILD.gn +++ b/sync/protocol/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//third_party/protobuf/proto_library.gni") +import("protocol_sources.gni") # This must be a component for the dependency structure we have now, but the # proto_library generates a source set. Link those into a component. @@ -15,49 +16,7 @@ component("protocol") { proto_library("protocol_internal") { visibility = [ ":protocol" ] - sources = [ - "app_list_specifics.proto", - "app_notification_specifics.proto", - "app_setting_specifics.proto", - "app_specifics.proto", - "article_specifics.proto", - "attachments.proto", - "autofill_specifics.proto", - "bookmark_specifics.proto", - "client_commands.proto", - "client_debug_info.proto", - "device_info_specifics.proto", - "dictionary_specifics.proto", - "encryption.proto", - "entity_metadata.proto", - "experiment_status.proto", - "experiments_specifics.proto", - "extension_setting_specifics.proto", - "extension_specifics.proto", - "favicon_image_specifics.proto", - "favicon_tracking_specifics.proto", - "get_updates_caller_info.proto", - "history_delete_directive_specifics.proto", - "managed_user_setting_specifics.proto", - "managed_user_shared_setting_specifics.proto", - "managed_user_specifics.proto", - "managed_user_whitelist_specifics.proto", - "nigori_specifics.proto", - "password_specifics.proto", - "preference_specifics.proto", - "priority_preference_specifics.proto", - "search_engine_specifics.proto", - "session_specifics.proto", - "sync.proto", - "sync_enums.proto", - "synced_notification_app_info_specifics.proto", - "synced_notification_specifics.proto", - "test.proto", - "theme_specifics.proto", - "typed_url_specifics.proto", - "unique_position.proto", - "wifi_credential_specifics.proto", - ] + sources = sync_protocol_sources cc_generator_options = "dllexport_decl=SYNC_PROTO_EXPORT:" cc_include = "sync/protocol/sync_proto_export.h" diff --git a/sync/protocol/protocol.gypi b/sync/protocol/protocol.gypi index 82f7dd4..21aa65d 100644 --- a/sync/protocol/protocol.gypi +++ b/sync/protocol/protocol.gypi @@ -11,9 +11,6 @@ # The list of sync protocol buffer definitions. 'sync_proto_source_paths': [ - # NOTE: If you add a file to this list, also add it to - # sync/protocol/BUILD.gn - # TODO(pvalenzuela): Eliminate the requirement to update the GN file. '<(sync_proto_sources_dir)/app_notification_specifics.proto', '<(sync_proto_sources_dir)/app_setting_specifics.proto', '<(sync_proto_sources_dir)/app_specifics.proto', diff --git a/sync/protocol/protocol_sources.gni b/sync/protocol/protocol_sources.gni new file mode 100644 index 0000000..86cefae --- /dev/null +++ b/sync/protocol/protocol_sources.gni @@ -0,0 +1,14 @@ +# Copyright 2015 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. + +protocol_gypi = + exec_script("//build/gypi_to_gn.py", + [ + rebase_path("//sync/protocol/protocol.gypi"), + "--replace=<(sync_proto_sources_dir)=//sync/protocol", + ], + "scope", + [ "//sync/protocol/protocol.gypi" ]) + +sync_protocol_sources = protocol_gypi.sync_proto_source_paths |