From 9b7f7a293ca700d280986e6b1ab1a7d80f4f2f19 Mon Sep 17 00:00:00 2001 From: edwinwu Date: Wed, 5 Jan 2022 06:55:15 -0800 Subject: [PATCH] add copybara rule of import/include for ios platform PiperOrigin-RevId: 419820195 --- .../impl/ios/Source/Internal/GNCAdvertiser.mm | 30 ++++++++-------- .../impl/ios/Source/Internal/GNCCore.mm | 14 ++++---- .../ios/Source/Internal/GNCCoreConnection.h | 4 +-- .../ios/Source/Internal/GNCCoreConnection.mm | 24 ++++++------- .../impl/ios/Source/Internal/GNCDiscoverer.mm | 28 +++++++-------- .../ios/Source/Internal/GNCPayload+Internal.h | 2 +- .../impl/ios/Source/Internal/GNCPayload.m | 2 +- .../ios/Source/Internal/GNCPayloadListener.h | 4 +-- .../ios/Source/Internal/GNCPayloadListener.mm | 28 +++++++-------- .../impl/ios/Source/Internal/GNCUtils.h | 4 +-- .../impl/ios/Source/Internal/GNCUtils.mm | 8 ++--- .../impl/ios/Source/Internal/platform.mm | 34 +++++++++---------- .../impl/ios/Source/Mediums/GNCLeaks.m | 2 +- .../impl/ios/Source/Mediums/GNCMConnection.m | 2 +- .../Mediums/WifiLan/GNCMBonjourBrowser.h | 2 +- .../Mediums/WifiLan/GNCMBonjourBrowser.m | 10 +++--- .../Mediums/WifiLan/GNCMBonjourConnection.h | 2 +- .../Mediums/WifiLan/GNCMBonjourConnection.m | 6 ++-- .../Mediums/WifiLan/GNCMBonjourService.h | 2 +- .../Mediums/WifiLan/GNCMBonjourService.m | 10 +++--- .../Source/Mediums/WifiLan/GNCMBonjourUtils.m | 2 +- .../impl/ios/Source/Platform/crypto.mm | 8 ++--- .../impl/ios/Source/Platform/input_file.mm | 6 ++-- .../impl/ios/Source/Platform/log_message.mm | 8 ++--- .../Source/Platform/multi_thread_executor.h | 4 +-- .../Source/Platform/multi_thread_executor.mm | 6 ++-- .../ios/Source/Platform/scheduled_executor.mm | 8 ++--- .../Source/Platform/single_thread_executor.h | 2 +- .../impl/ios/Source/Platform/utils.mm | 8 ++--- .../impl/ios/Source/Platform/wifi_lan.h | 2 +- .../impl/ios/Source/Platform/wifi_lan.mm | 34 +++++++++---------- .../impl/ios/Source/Shared/GNCUtils.m | 10 +++--- .../impl/ios/Tests/Platform/GNCCryptoTest.mm | 4 +-- .../ios/Tests/Platform/GNCInputFileTest.mm | 6 ++-- .../Platform/GNCMultiThreadExecutorTest.mm | 12 +++---- .../Platform/GNCScheduledExecutorTest.mm | 12 +++---- .../Platform/GNCSingleThreadExecutorTest.mm | 12 +++---- .../impl/ios/Tests/Shared/GNCUtilsTest.mm | 4 +-- 38 files changed, 183 insertions(+), 183 deletions(-) diff --git a/cpp/platform/impl/ios/Source/Internal/GNCAdvertiser.mm b/cpp/platform/impl/ios/Source/Internal/GNCAdvertiser.mm index a1a11943..ec7c6ba6 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCAdvertiser.mm +++ b/cpp/platform/impl/ios/Source/Internal/GNCAdvertiser.mm @@ -12,24 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCAdvertiser.h" +#import "platform/impl/ios/Source/GNCAdvertiser.h" #include -#include "third_party/absl/functional/bind_front.h" -#include "third_party/nearby/cpp/core/core.h" -#include "third_party/nearby/cpp/core/listeners.h" -#include "third_party/nearby/cpp/core/options.h" -#include "third_party/nearby/cpp/core/params.h" -#include "third_party/nearby/cpp/core/status.h" -#include "third_party/nearby/cpp/platform/base/byte_array.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCore.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCUtils.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h" -#import "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMLogger.h" +#include "absl/functional/bind_front.h" +#include "core/core.h" +#include "core/listeners.h" +#include "core/options.h" +#include "core/params.h" +#include "core/status.h" +#include "platform/base/byte_array.h" +#import "platform/impl/ios/Source/GNCConnection.h" +#import "platform/impl/ios/Source/Internal/GNCCore.h" +#import "platform/impl/ios/Source/Internal/GNCCoreConnection.h" +#import "platform/impl/ios/Source/Internal/GNCPayloadListener.h" +#import "platform/impl/ios/Source/Internal/GNCUtils.h" +#import "platform/impl/ios/Source/Platform/utils.h" +#import "GoogleToolboxForMac/GTMLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Internal/GNCCore.mm b/cpp/platform/impl/ios/Source/Internal/GNCCore.mm index 3f84ec37..20e2dda0 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCCore.mm +++ b/cpp/platform/impl/ios/Source/Internal/GNCCore.mm @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCore.h" +#import "platform/impl/ios/Source/Internal/GNCCore.h" #include -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/container/internal/common.h" -#include "third_party/nearby/cpp/core/core.h" -#include "third_party/nearby/cpp/core/internal/service_controller_router.h" -#include "third_party/nearby/cpp/platform/base/payload_id.h" -#import "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMLogger.h" +#include "absl/container/flat_hash_map.h" +#include "absl/container/internal/common.h" +#include "core/core.h" +#include "core/internal/service_controller_router.h" +#include "platform/base/payload_id.h" +#import "GoogleToolboxForMac/GTMLogger.h" using ::location::nearby::connections::Core; using ::location::nearby::PayloadId; diff --git a/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.h b/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.h index 78e46602..cc73eb83 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.h +++ b/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.h @@ -14,8 +14,8 @@ #import -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCore.h" +#import "platform/impl/ios/Source/GNCConnection.h" +#import "platform/impl/ios/Source/Internal/GNCCore.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.mm b/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.mm index 30daf0d2..ce87bcc3 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.mm +++ b/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.mm @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.h" +#import "platform/impl/ios/Source/Internal/GNCCoreConnection.h" -#include "third_party/nearby/cpp/core/core.h" -#include "third_party/nearby/cpp/core/payload.h" -#include "third_party/nearby/cpp/platform/api/input_file.h" -#import "third_party/nearby/cpp/platform/base/exception.h" -#include "third_party/nearby/cpp/platform/base/input_stream.h" -#import "third_party/nearby/cpp/platform/base/payload_id.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCPayload.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCore.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h" -#include "third_party/nearby/cpp/platform/public/file.h" +#include "core/core.h" +#include "core/payload.h" +#include "platform/api/input_file.h" +#include "platform/base/exception.h" +#include "platform/base/input_stream.h" +#include "platform/base/payload_id.h" +#import "platform/impl/ios/Source/GNCConnection.h" +#import "platform/impl/ios/Source/GNCPayload.h" +#import "platform/impl/ios/Source/Internal/GNCCore.h" +#import "platform/impl/ios/Source/Platform/utils.h" +#include "platform/public/file.h" using ::location::nearby::ByteArrayFromNSData; using ::location::nearby::CppStringFromObjCString; diff --git a/cpp/platform/impl/ios/Source/Internal/GNCDiscoverer.mm b/cpp/platform/impl/ios/Source/Internal/GNCDiscoverer.mm index cbc670f9..b9245ac6 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCDiscoverer.mm +++ b/cpp/platform/impl/ios/Source/Internal/GNCDiscoverer.mm @@ -12,24 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCDiscoverer.h" +#import "platform/impl/ios/Source/GNCDiscoverer.h" #include #include -#include "third_party/absl/functional/bind_front.h" -#include "third_party/nearby/cpp/core/core.h" -#include "third_party/nearby/cpp/core/listeners.h" -#include "third_party/nearby/cpp/core/options.h" -#include "third_party/nearby/cpp/core/status.h" -#include "third_party/nearby/cpp/platform/base/byte_array.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCore.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCUtils.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h" -#import "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMLogger.h" +#include "absl/functional/bind_front.h" +#include "core/core.h" +#include "core/listeners.h" +#include "core/options.h" +#include "core/status.h" +#include "platform/base/byte_array.h" +#import "platform/impl/ios/Source/GNCConnection.h" +#import "platform/impl/ios/Source/Internal/GNCCore.h" +#import "platform/impl/ios/Source/Internal/GNCCoreConnection.h" +#import "platform/impl/ios/Source/Internal/GNCPayloadListener.h" +#import "platform/impl/ios/Source/Internal/GNCUtils.h" +#import "platform/impl/ios/Source/Platform/utils.h" +#import "GoogleToolboxForMac/GTMLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Internal/GNCPayload+Internal.h b/cpp/platform/impl/ios/Source/Internal/GNCPayload+Internal.h index eec59066..6fb7415a 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCPayload+Internal.h +++ b/cpp/platform/impl/ios/Source/Internal/GNCPayload+Internal.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCPayload.h" +#import "platform/impl/ios/Source/GNCPayload.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Internal/GNCPayload.m b/cpp/platform/impl/ios/Source/Internal/GNCPayload.m index 0b975305..8de5382f 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCPayload.m +++ b/cpp/platform/impl/ios/Source/Internal/GNCPayload.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCPayload.h" +#import "platform/impl/ios/Source/GNCPayload.h" #include diff --git a/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.h b/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.h index 65aed071..32e26302 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.h +++ b/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.h @@ -14,8 +14,8 @@ #import -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCore.h" +#import "platform/impl/ios/Source/GNCConnection.h" +#import "platform/impl/ios/Source/Internal/GNCCore.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.mm b/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.mm index f7efb389..0315b7af 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.mm +++ b/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.mm @@ -12,23 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCPayloadListener.h" +#import "platform/impl/ios/Source/Internal/GNCPayloadListener.h" #include -#include "third_party/nearby/cpp/core/core.h" -#include "third_party/nearby/cpp/core/listeners.h" -#include "third_party/nearby/cpp/core/payload.h" -#include "third_party/nearby/cpp/platform/base/byte_array.h" -#include "third_party/nearby/cpp/platform/base/exception.h" -#include "third_party/nearby/cpp/platform/base/input_stream.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCPayload.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCore.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCoreConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCPayload+Internal.h" -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h" -#include "third_party/nearby/cpp/platform/public/file.h" +#include "core/core.h" +#include "core/listeners.h" +#include "core/payload.h" +#include "platform/base/byte_array.h" +#include "platform/base/exception.h" +#include "platform/base/input_stream.h" +#import "platform/impl/ios/Source/GNCConnection.h" +#import "platform/impl/ios/Source/GNCPayload.h" +#import "platform/impl/ios/Source/Internal/GNCCore.h" +#import "platform/impl/ios/Source/Internal/GNCCoreConnection.h" +#import "platform/impl/ios/Source/Internal/GNCPayload+Internal.h" +#include "platform/impl/ios/Source/Platform/utils.h" +#include "platform/public/file.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Internal/GNCUtils.h b/cpp/platform/impl/ios/Source/Internal/GNCUtils.h index 7e37e5f0..627088a3 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCUtils.h +++ b/cpp/platform/impl/ios/Source/Internal/GNCUtils.h @@ -18,8 +18,8 @@ #include "core/listeners.h" #include "core/options.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCAdvertiser.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCConnection.h" +#import "platform/impl/ios/Source/GNCAdvertiser.h" +#import "platform/impl/ios/Source/GNCConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Internal/GNCUtils.mm b/cpp/platform/impl/ios/Source/Internal/GNCUtils.mm index d4223160..4b7250f6 100644 --- a/cpp/platform/impl/ios/Source/Internal/GNCUtils.mm +++ b/cpp/platform/impl/ios/Source/Internal/GNCUtils.mm @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCUtils.h" +#import "platform/impl/ios/Source/Internal/GNCUtils.h" -#include "third_party/nearby/cpp/core/strategy.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCAdvertiser.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/GNCConnection.h" +#include "core/strategy.h" +#import "platform/impl/ios/Source/GNCAdvertiser.h" +#import "platform/impl/ios/Source/GNCConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Internal/platform.mm b/cpp/platform/impl/ios/Source/Internal/platform.mm index 21f64426..2e72e6f7 100644 --- a/cpp/platform/impl/ios/Source/Internal/platform.mm +++ b/cpp/platform/impl/ios/Source/Internal/platform.mm @@ -12,26 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/cpp/platform/api/platform.h" +#include "platform/api/platform.h" #include -#include "third_party/nearby/cpp/platform/api/mutex.h" -#include "third_party/nearby/cpp/platform/base/payload_id.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Internal/GNCCore.h" -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/atomic_boolean.h" -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/atomic_uint32.h" -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/condition_variable.h" -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/count_down_latch.h" -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/input_file.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/log_message.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h" -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/mutex.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/scheduled_executor.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/single_thread_executor.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h" -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/wifi_lan.h" -#include "third_party/nearby/cpp/platform/impl/shared/file.h" +#include "platform/api/mutex.h" +#include "platform/base/payload_id.h" +#import "platform/impl/ios/Source/Internal/GNCCore.h" +#include "platform/impl/ios/Source/Platform/atomic_boolean.h" +#include "platform/impl/ios/Source/Platform/atomic_uint32.h" +#include "platform/impl/ios/Source/Platform/condition_variable.h" +#include "platform/impl/ios/Source/Platform/count_down_latch.h" +#include "platform/impl/ios/Source/Platform/input_file.h" +#import "platform/impl/ios/Source/Platform/log_message.h" +#import "platform/impl/ios/Source/Platform/multi_thread_executor.h" +#include "platform/impl/ios/Source/Platform/mutex.h" +#import "platform/impl/ios/Source/Platform/scheduled_executor.h" +#import "platform/impl/ios/Source/Platform/single_thread_executor.h" +#import "platform/impl/ios/Source/Platform/utils.h" +#include "platform/impl/ios/Source/Platform/wifi_lan.h" +#include "platform/impl/shared/file.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/ios/Source/Mediums/GNCLeaks.m b/cpp/platform/impl/ios/Source/Mediums/GNCLeaks.m index 9786b5dc..7cdac64f 100644 --- a/cpp/platform/impl/ios/Source/Mediums/GNCLeaks.m +++ b/cpp/platform/impl/ios/Source/Mediums/GNCLeaks.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCLeaks.h" +#import "platform/impl/ios/Source/Mediums/GNCLeaks.h" void GNCVerifyDealloc(id object, NSTimeInterval timeInterval) { #if DEBUG diff --git a/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.m b/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.m index 220b6226..1b0f0dc7 100644 --- a/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.m +++ b/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" +#import "platform/impl/ios/Source/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h index 1d6a6e35..16d1ed28 100644 --- a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h +++ b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h @@ -14,7 +14,7 @@ #import -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" +#import "platform/impl/ios/Source/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.m b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.m index 03b18d60..f3717418 100644 --- a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.m +++ b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.m @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h" +#import "platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h" -#import "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMLogger.h" +#import "platform/impl/ios/Source/Mediums/GNCMConnection.h" +#import "platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h" +#import "platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h" +#import "GoogleToolboxForMac/GTMLogger.h" typedef NSString *GNCEndpointId; diff --git a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h index ed6c5921..e5c3260e 100644 --- a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h +++ b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h @@ -14,7 +14,7 @@ #import -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" +#import "platform/impl/ios/Source/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.m b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.m index 13046b0e..db622da3 100644 --- a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.m +++ b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.m @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h" +#import "platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" -#import "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMLogger.h" +#import "platform/impl/ios/Source/Mediums/GNCMConnection.h" +#import "GoogleToolboxForMac/GTMLogger.h" enum { kMaxPacketSize = 32 * 1024 }; diff --git a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.h b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.h index 9386e652..4509b0d3 100644 --- a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.h +++ b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.h @@ -14,7 +14,7 @@ #import -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" +#import "platform/impl/ios/Source/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.m b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.m index be9a6970..02d75eb8 100644 --- a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.m +++ b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.m @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.h" +#import "platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h" -#import "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMLogger.h" +#import "platform/impl/ios/Source/Mediums/GNCMConnection.h" +#import "platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h" +#import "platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h" +#import "GoogleToolboxForMac/GTMLogger.h" @interface GNCMBonjourService () diff --git a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.m b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.m index b508a582..33dbfb2b 100644 --- a/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.m +++ b/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.m @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h" +#import "platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h" NSString *const GNCMBonjourDomain = @"local"; diff --git a/cpp/platform/impl/ios/Source/Platform/crypto.mm b/cpp/platform/impl/ios/Source/Platform/crypto.mm index cdb38d57..11ce1410 100644 --- a/cpp/platform/impl/ios/Source/Platform/crypto.mm +++ b/cpp/platform/impl/ios/Source/Platform/crypto.mm @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/cpp/platform/api/crypto.h" +#include "platform/api/crypto.h" -#import "third_party/absl/strings/string_view.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Shared/GNCUtils.h" +#import "absl/strings/string_view.h" +#import "platform/impl/ios/Source/Platform/utils.h" +#import "platform/impl/ios/Source/Shared/GNCUtils.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/ios/Source/Platform/input_file.mm b/cpp/platform/impl/ios/Source/Platform/input_file.mm index ffaee79e..57cfc81e 100644 --- a/cpp/platform/impl/ios/Source/Platform/input_file.mm +++ b/cpp/platform/impl/ios/Source/Platform/input_file.mm @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/input_file.h" +#import "platform/impl/ios/Source/Platform/input_file.h" #include -#import "third_party/nearby/cpp/platform/base/exception.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h" +#import "platform/base/exception.h" +#import "platform/impl/ios/Source/Platform/utils.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/ios/Source/Platform/log_message.mm b/cpp/platform/impl/ios/Source/Platform/log_message.mm index fec416f0..6a2f23e6 100644 --- a/cpp/platform/impl/ios/Source/Platform/log_message.mm +++ b/cpp/platform/impl/ios/Source/Platform/log_message.mm @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/log_message.h" +#include "platform/impl/ios/Source/Platform/log_message.h" -#include "base/logging.h" -#include "third_party/nearby/cpp/platform/api/log_message.h" -#include "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMLogger.h" +#include "base/check.h" +#include "platform/api/log_message.h" +#include "GoogleToolboxForMac/GTMLogger.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h b/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h index 38eb9926..44efffd3 100644 --- a/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h +++ b/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h @@ -16,8 +16,8 @@ #define PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_ #include "platform/api/submittable_executor.h" -#import "third_party/nearby/cpp/platform/base/runnable.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/scheduled_executor.h" +#import "platform/base/runnable.h" +#import "platform/impl/ios/Source/Platform/scheduled_executor.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.mm b/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.mm index 7d342531..39e2b0a8 100644 --- a/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.mm +++ b/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.mm @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h" +#import "platform/impl/ios/Source/Platform/multi_thread_executor.h" -#include "third_party/nearby/cpp/platform/base/runnable.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/scheduled_executor.h" +#include "platform/base/runnable.h" +#import "platform/impl/ios/Source/Platform/scheduled_executor.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/ios/Source/Platform/scheduled_executor.mm b/cpp/platform/impl/ios/Source/Platform/scheduled_executor.mm index d9b562c6..cf9da971 100644 --- a/cpp/platform/impl/ios/Source/Platform/scheduled_executor.mm +++ b/cpp/platform/impl/ios/Source/Platform/scheduled_executor.mm @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/scheduled_executor.h" +#import "platform/impl/ios/Source/Platform/scheduled_executor.h" #import -#include "third_party/absl/time/time.h" -#include "third_party/nearby/cpp/platform/base/runnable.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/atomic_boolean.h" +#include "absl/time/time.h" +#include "platform/base/runnable.h" +#import "platform/impl/ios/Source/Platform/atomic_boolean.h" // This wraps the C++ Runnable in an Obj-C object for memory management. It is retained by the // dispatch block below, and deleted when the block is released. diff --git a/cpp/platform/impl/ios/Source/Platform/single_thread_executor.h b/cpp/platform/impl/ios/Source/Platform/single_thread_executor.h index 7162d075..664abb87 100644 --- a/cpp/platform/impl/ios/Source/Platform/single_thread_executor.h +++ b/cpp/platform/impl/ios/Source/Platform/single_thread_executor.h @@ -15,7 +15,7 @@ #ifndef PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_ #define PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_ -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h" +#import "platform/impl/ios/Source/Platform/multi_thread_executor.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/ios/Source/Platform/utils.mm b/cpp/platform/impl/ios/Source/Platform/utils.mm index 3f79ecea..08c9f633 100644 --- a/cpp/platform/impl/ios/Source/Platform/utils.mm +++ b/cpp/platform/impl/ios/Source/Platform/utils.mm @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h" +#import "platform/impl/ios/Source/Platform/utils.h" -#import "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/strings/string_view.h" -#include "third_party/nearby/cpp/platform/base/byte_array.h" +#import "absl/container/flat_hash_map.h" +#include "absl/strings/string_view.h" +#include "platform/base/byte_array.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Source/Platform/wifi_lan.h b/cpp/platform/impl/ios/Source/Platform/wifi_lan.h index 13062b4f..71a7cf8f 100644 --- a/cpp/platform/impl/ios/Source/Platform/wifi_lan.h +++ b/cpp/platform/impl/ios/Source/Platform/wifi_lan.h @@ -22,7 +22,7 @@ #include "absl/container/flat_hash_map.h" #include "platform/api/wifi_lan.h" #include "platform/base/nsd_service_info.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" // IWYU pragma: export +#import "platform/impl/ios/Source/Mediums/GNCMConnection.h" // IWYU pragma: export @class GNCMBonjourBrowser; @class GNCMBonjourService; diff --git a/cpp/platform/impl/ios/Source/Platform/wifi_lan.mm b/cpp/platform/impl/ios/Source/Platform/wifi_lan.mm index c46fe616..ecd1b9e5 100644 --- a/cpp/platform/impl/ios/Source/Platform/wifi_lan.mm +++ b/cpp/platform/impl/ios/Source/Platform/wifi_lan.mm @@ -12,28 +12,28 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/wifi_lan.h" +#import "platform/impl/ios/Source/Platform/wifi_lan.h" #include #include #include -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/container/internal/common.h" -#include "third_party/absl/memory/memory.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_format.h" -#include "third_party/absl/synchronization/mutex.h" -#include "third_party/nearby/cpp/platform/api/wifi_lan.h" -#include "third_party/nearby/cpp/platform/base/cancellation_flag.h" -#include "third_party/nearby/cpp/platform/base/exception.h" -#include "third_party/nearby/cpp/platform/base/nsd_service_info.h" -#include "third_party/nearby/cpp/platform/base/prng.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.h" -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h" -#import "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMLogger.h" +#include "absl/container/flat_hash_map.h" +#include "absl/container/internal/common.h" +#include "absl/memory/memory.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/synchronization/mutex.h" +#include "platform/api/wifi_lan.h" +#include "platform/base/cancellation_flag.h" +#include "platform/base/exception.h" +#include "platform/base/nsd_service_info.h" +#include "platform/base/prng.h" +#import "platform/impl/ios/Source/Mediums/GNCMConnection.h" +#import "platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h" +#import "platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.h" +#include "platform/impl/ios/Source/Platform/utils.h" +#import "GoogleToolboxForMac/GTMLogger.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/ios/Source/Shared/GNCUtils.m b/cpp/platform/impl/ios/Source/Shared/GNCUtils.m index e8a91a12..8a4f4816 100644 --- a/cpp/platform/impl/ios/Source/Shared/GNCUtils.m +++ b/cpp/platform/impl/ios/Source/Shared/GNCUtils.m @@ -1,8 +1,3 @@ -#import "third_party/nearby/cpp/platform/impl/ios/Source/Shared/GNCUtils.h" - -#import - -#import "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMStringEncoding.h" // Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,6 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#import "platform/impl/ios/Source/Shared/GNCUtils.h" + +#import + +#import "GoogleToolboxForMac/GTMStringEncoding.h" NS_ASSUME_NONNULL_BEGIN diff --git a/cpp/platform/impl/ios/Tests/Platform/GNCCryptoTest.mm b/cpp/platform/impl/ios/Tests/Platform/GNCCryptoTest.mm index d5ab389b..66c686f4 100644 --- a/cpp/platform/impl/ios/Tests/Platform/GNCCryptoTest.mm +++ b/cpp/platform/impl/ios/Tests/Platform/GNCCryptoTest.mm @@ -14,8 +14,8 @@ #import -#include "third_party/nearby/cpp/platform/api/crypto.h" -#include "third_party/nearby/cpp/platform/base/byte_array.h" +#include "platform/api/crypto.h" +#include "platform/base/byte_array.h" @interface GNCCryptoTest : XCTestCase @end diff --git a/cpp/platform/impl/ios/Tests/Platform/GNCInputFileTest.mm b/cpp/platform/impl/ios/Tests/Platform/GNCInputFileTest.mm index 361b9055..b741f23e 100644 --- a/cpp/platform/impl/ios/Tests/Platform/GNCInputFileTest.mm +++ b/cpp/platform/impl/ios/Tests/Platform/GNCInputFileTest.mm @@ -14,9 +14,9 @@ #import -#import "third_party/nearby/cpp/platform/base/byte_array.h" -#import "third_party/nearby/cpp/platform/base/exception.h" -#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/input_file.h" +#import "platform/base/byte_array.h" +#import "platform/base/exception.h" +#import "platform/impl/ios/Source/Platform/input_file.h" using ::location::nearby::ios::InputFile; using ::location::nearby::ByteArray; diff --git a/cpp/platform/impl/ios/Tests/Platform/GNCMultiThreadExecutorTest.mm b/cpp/platform/impl/ios/Tests/Platform/GNCMultiThreadExecutorTest.mm index 40d7b6f5..702169a2 100644 --- a/cpp/platform/impl/ios/Tests/Platform/GNCMultiThreadExecutorTest.mm +++ b/cpp/platform/impl/ios/Tests/Platform/GNCMultiThreadExecutorTest.mm @@ -14,12 +14,12 @@ #import -#include "third_party/absl/time/time.h" -#include "third_party/nearby/cpp/platform/api/cancelable.h" -#include "third_party/nearby/cpp/platform/api/executor.h" -#include "third_party/nearby/cpp/platform/api/platform.h" -#include "third_party/nearby/cpp/platform/api/submittable_executor.h" -#include "third_party/nearby/cpp/platform/base/runnable.h" +#include "absl/time/time.h" +#include "platform/api/cancelable.h" +#include "platform/api/executor.h" +#include "platform/api/platform.h" +#include "platform/api/submittable_executor.h" +#include "platform/base/runnable.h" using location::nearby::Runnable; using location::nearby::api::ImplementationPlatform; diff --git a/cpp/platform/impl/ios/Tests/Platform/GNCScheduledExecutorTest.mm b/cpp/platform/impl/ios/Tests/Platform/GNCScheduledExecutorTest.mm index 27aa566a..1346a463 100644 --- a/cpp/platform/impl/ios/Tests/Platform/GNCScheduledExecutorTest.mm +++ b/cpp/platform/impl/ios/Tests/Platform/GNCScheduledExecutorTest.mm @@ -14,12 +14,12 @@ #import -#include "third_party/absl/time/time.h" -#include "third_party/nearby/cpp/platform/api/cancelable.h" -#include "third_party/nearby/cpp/platform/api/executor.h" -#include "third_party/nearby/cpp/platform/api/platform.h" -#include "third_party/nearby/cpp/platform/api/scheduled_executor.h" -#include "third_party/nearby/cpp/platform/base/runnable.h" +#include "absl/time/time.h" +#include "platform/api/cancelable.h" +#include "platform/api/executor.h" +#include "platform/api/platform.h" +#include "platform/api/scheduled_executor.h" +#include "platform/base/runnable.h" using location::nearby::Runnable; using location::nearby::api::ImplementationPlatform; diff --git a/cpp/platform/impl/ios/Tests/Platform/GNCSingleThreadExecutorTest.mm b/cpp/platform/impl/ios/Tests/Platform/GNCSingleThreadExecutorTest.mm index 1be259b1..da651a84 100644 --- a/cpp/platform/impl/ios/Tests/Platform/GNCSingleThreadExecutorTest.mm +++ b/cpp/platform/impl/ios/Tests/Platform/GNCSingleThreadExecutorTest.mm @@ -14,12 +14,12 @@ #import -#include "third_party/absl/time/time.h" -#include "third_party/nearby/cpp/platform/api/cancelable.h" -#include "third_party/nearby/cpp/platform/api/executor.h" -#include "third_party/nearby/cpp/platform/api/platform.h" -#include "third_party/nearby/cpp/platform/api/submittable_executor.h" -#include "third_party/nearby/cpp/platform/base/runnable.h" +#include "absl/time/time.h" +#include "platform/api/cancelable.h" +#include "platform/api/executor.h" +#include "platform/api/platform.h" +#include "platform/api/submittable_executor.h" +#include "platform/base/runnable.h" using location::nearby::Runnable; using location::nearby::api::ImplementationPlatform; diff --git a/cpp/platform/impl/ios/Tests/Shared/GNCUtilsTest.mm b/cpp/platform/impl/ios/Tests/Shared/GNCUtilsTest.mm index d631eae8..10544741 100644 --- a/cpp/platform/impl/ios/Tests/Shared/GNCUtilsTest.mm +++ b/cpp/platform/impl/ios/Tests/Shared/GNCUtilsTest.mm @@ -14,8 +14,8 @@ #import -#include "third_party/nearby/cpp/platform/base/byte_array.h" -#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h" +#include "platform/base/byte_array.h" +#include "platform/impl/ios/Source/Platform/utils.h" using location::nearby::ByteArray; using location::nearby::ByteArrayFromNSData;