From c2d87d28acc9687ec899504e0f2b09d70827eedb Mon Sep 17 00:00:00 2001 From: Francis Tsui Date: Thu, 1 Feb 2024 22:26:08 -0800 Subject: [PATCH] Add flags to github. PiperOrigin-RevId: 603584214 --- sharing/BUILD | 5 ++--- sharing/flags/generated/README.md | 6 ++++++ sharing/nearby_connections_manager_impl.cc | 2 +- sharing/nearby_connections_manager_impl_test.cc | 2 +- sharing/nearby_sharing_service_impl.cc | 2 +- sharing/nearby_sharing_service_impl_test.cc | 2 +- sharing/nearby_sharing_settings.cc | 2 +- sharing/nearby_sharing_util.cc | 2 +- sharing/paired_key_verification_runner_test.cc | 2 +- 9 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 sharing/flags/generated/README.md diff --git a/sharing/BUILD b/sharing/BUILD index d1e95310..676f06b8 100644 --- a/sharing/BUILD +++ b/sharing/BUILD @@ -117,7 +117,6 @@ cc_library( "share_target_info.h", "transfer_manager.h", "transfer_update_callback.h", - "//sharing/flags:nearby_sharing_feature_flags.h", ], copts = [ "-DNEARBY_SHARING_DLL", @@ -147,7 +146,7 @@ cc_library( "//sharing/common:compatible_u8_string", "//sharing/contacts", "//sharing/fast_initiation:nearby_fast_initiation", - "//sharing/flags:nearby_sharing_feature_flags_cpp_consts_generated", + "//sharing/flags/generated:generated_flags", "//sharing/internal/api:platform", "//sharing/internal/base", "//sharing/internal/public:logging", @@ -261,7 +260,7 @@ cc_test( "//sharing/contacts:test_support", "//sharing/fast_initiation:nearby_fast_initiation", "//sharing/fast_initiation:test_support", - "//sharing/flags:nearby_sharing_feature_flags_cpp_consts_generated", + "//sharing/flags/generated:generated_flags", "//sharing/internal/api:mock_sharing_platform", "//sharing/internal/api:platform", "//sharing/internal/public:types", diff --git a/sharing/flags/generated/README.md b/sharing/flags/generated/README.md new file mode 100644 index 00000000..b6904e1e --- /dev/null +++ b/sharing/flags/generated/README.md @@ -0,0 +1,6 @@ +# Feature flags generation + +This directory contains the Nearby Share feature flags definition that is +generated by the [better_together Rapid job](https://rapid.corp.google.com/#/project/better_together). + +TODO: (b/323371097) Add process to update generated flags file. \ No newline at end of file diff --git a/sharing/nearby_connections_manager_impl.cc b/sharing/nearby_connections_manager_impl.cc index f56f47f8..f4d41e62 100644 --- a/sharing/nearby_connections_manager_impl.cc +++ b/sharing/nearby_connections_manager_impl.cc @@ -38,7 +38,7 @@ #include "sharing/advertisement.h" #include "sharing/common/nearby_share_enums.h" #include "sharing/constants.h" -#include "sharing/flags/nearby_sharing_feature_flags.h" +#include "sharing/flags/generated/nearby_sharing_feature_flags.h" #include "sharing/internal/api/bluetooth_adapter.h" #include "sharing/internal/base/encode.h" #include "sharing/internal/public/connectivity_manager.h" diff --git a/sharing/nearby_connections_manager_impl_test.cc b/sharing/nearby_connections_manager_impl_test.cc index 614e9559..ea897290 100644 --- a/sharing/nearby_connections_manager_impl_test.cc +++ b/sharing/nearby_connections_manager_impl_test.cc @@ -41,7 +41,7 @@ #include "sharing/common/nearby_share_enums.h" #include "sharing/constants.h" #include "sharing/fake_nearby_connections_service.h" -#include "sharing/flags/nearby_sharing_feature_flags.h" +#include "sharing/flags/generated/nearby_sharing_feature_flags.h" #include "sharing/internal/public/connectivity_manager.h" #include "sharing/internal/test/fake_connectivity_manager.h" #include "sharing/internal/test/fake_context.h" diff --git a/sharing/nearby_sharing_service_impl.cc b/sharing/nearby_sharing_service_impl.cc index 1f3f55ca..2b6dee4f 100644 --- a/sharing/nearby_sharing_service_impl.cc +++ b/sharing/nearby_sharing_service_impl.cc @@ -65,7 +65,7 @@ #include "sharing/fast_initiation/nearby_fast_initiation.h" #include "sharing/fast_initiation/nearby_fast_initiation_impl.h" #include "sharing/file_attachment.h" -#include "sharing/flags/nearby_sharing_feature_flags.h" +#include "sharing/flags/generated/nearby_sharing_feature_flags.h" #include "sharing/incoming_frames_reader.h" #include "sharing/incoming_share_target_info.h" #include "sharing/internal/api/bluetooth_adapter.h" diff --git a/sharing/nearby_sharing_service_impl_test.cc b/sharing/nearby_sharing_service_impl_test.cc index 41081c10..7aa1cd3b 100644 --- a/sharing/nearby_sharing_service_impl_test.cc +++ b/sharing/nearby_sharing_service_impl_test.cc @@ -64,7 +64,7 @@ #include "sharing/fast_initiation/fake_nearby_fast_initiation.h" #include "sharing/fast_initiation/nearby_fast_initiation_impl.h" #include "sharing/file_attachment.h" -#include "sharing/flags/nearby_sharing_feature_flags.h" +#include "sharing/flags/generated/nearby_sharing_feature_flags.h" #include "sharing/internal/api/mock_sharing_platform.h" #include "sharing/internal/api/preference_manager.h" #include "sharing/internal/public/connectivity_manager.h" diff --git a/sharing/nearby_sharing_settings.cc b/sharing/nearby_sharing_settings.cc index 78f86480..79d320bb 100644 --- a/sharing/nearby_sharing_settings.cc +++ b/sharing/nearby_sharing_settings.cc @@ -39,7 +39,7 @@ #include "sharing/common/compatible_u8_string.h" #include "sharing/common/nearby_share_enums.h" #include "sharing/common/nearby_share_prefs.h" -#include "sharing/flags/nearby_sharing_feature_flags.h" +#include "sharing/flags/generated/nearby_sharing_feature_flags.h" #include "sharing/internal/api/preference_manager.h" #include "sharing/internal/public/context.h" #include "sharing/internal/public/logging.h" diff --git a/sharing/nearby_sharing_util.cc b/sharing/nearby_sharing_util.cc index 9f403405..8dfc176f 100644 --- a/sharing/nearby_sharing_util.cc +++ b/sharing/nearby_sharing_util.cc @@ -33,7 +33,7 @@ #include "sharing/advertisement.h" #include "sharing/certificates/nearby_share_decrypted_public_certificate.h" #include "sharing/common/nearby_share_enums.h" -#include "sharing/flags/nearby_sharing_feature_flags.h" +#include "sharing/flags/generated/nearby_sharing_feature_flags.h" #include "sharing/internal/base/encode.h" #include "sharing/internal/public/logging.h" #include "sharing/nearby_connections_types.h" diff --git a/sharing/paired_key_verification_runner_test.cc b/sharing/paired_key_verification_runner_test.cc index 7a613842..bea8f536 100644 --- a/sharing/paired_key_verification_runner_test.cc +++ b/sharing/paired_key_verification_runner_test.cc @@ -38,7 +38,7 @@ #include "sharing/certificates/nearby_share_decrypted_public_certificate.h" #include "sharing/certificates/test_util.h" #include "sharing/fake_nearby_connection.h" -#include "sharing/flags/nearby_sharing_feature_flags.h" +#include "sharing/flags/generated/nearby_sharing_feature_flags.h" #include "sharing/incoming_frames_reader.h" #include "sharing/internal/public/context.h" #include "sharing/internal/test/fake_context.h"