From db1248d771d41b2dc4bc74f68f7b1464a4cf884f Mon Sep 17 00:00:00 2001 From: Alexey Polyudov Date: Thu, 1 Oct 2020 02:48:58 -0700 Subject: [PATCH] OSS fixes Signed-off-by: Alexey Polyudov Change-Id: I76049a5776a3d3603e9d2415d3242199bc136a22 --- cpp/platform_v2/impl/ios/BUILD | 14 ++++++++++++++ cpp/platform_v2/impl/ios/atomic_boolean.h | 14 ++++++++++++++ cpp/platform_v2/impl/ios/atomic_reference.h | 14 ++++++++++++++ cpp/platform_v2/impl/ios/condition_variable.h | 14 ++++++++++++++ cpp/platform_v2/impl/ios/count_down_latch.h | 14 ++++++++++++++ cpp/platform_v2/impl/ios/log_message.h | 14 ++++++++++++++ cpp/platform_v2/impl/ios/log_message.mm | 14 ++++++++++++++ cpp/platform_v2/impl/ios/multi_thread_executor.h | 14 ++++++++++++++ cpp/platform_v2/impl/ios/mutex.h | 14 ++++++++++++++ cpp/platform_v2/impl/ios/platform.mm | 14 ++++++++++++++ cpp/platform_v2/impl/ios/scheduled_executor.h | 14 ++++++++++++++ cpp/platform_v2/impl/ios/scheduled_executor.mm | 14 ++++++++++++++ cpp/platform_v2/impl/ios/single_thread_executor.h | 14 ++++++++++++++ proto/connections/offline_wire_formats.proto | 3 --- 14 files changed, 182 insertions(+), 3 deletions(-) diff --git a/cpp/platform_v2/impl/ios/BUILD b/cpp/platform_v2/impl/ios/BUILD index fa133022..fe757ec0 100644 --- a/cpp/platform_v2/impl/ios/BUILD +++ b/cpp/platform_v2/impl/ios/BUILD @@ -1,3 +1,17 @@ +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + objc_library( name = "types", srcs = [ diff --git a/cpp/platform_v2/impl/ios/atomic_boolean.h b/cpp/platform_v2/impl/ios/atomic_boolean.h index 37a1d1f1..af2de7a7 100644 --- a/cpp/platform_v2/impl/ios/atomic_boolean.h +++ b/cpp/platform_v2/impl/ios/atomic_boolean.h @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #ifndef PLATFORM_V2_IMPL_IOS_ATOMIC_BOOLEAN_H_ #define PLATFORM_V2_IMPL_IOS_ATOMIC_BOOLEAN_H_ diff --git a/cpp/platform_v2/impl/ios/atomic_reference.h b/cpp/platform_v2/impl/ios/atomic_reference.h index 49bb2849..84728d06 100644 --- a/cpp/platform_v2/impl/ios/atomic_reference.h +++ b/cpp/platform_v2/impl/ios/atomic_reference.h @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #ifndef PLATFORM_V2_IMPL_IOS_ATOMIC_REFERENCE_H_ #define PLATFORM_V2_IMPL_IOS_ATOMIC_REFERENCE_H_ diff --git a/cpp/platform_v2/impl/ios/condition_variable.h b/cpp/platform_v2/impl/ios/condition_variable.h index 4df6893a..fa571412 100644 --- a/cpp/platform_v2/impl/ios/condition_variable.h +++ b/cpp/platform_v2/impl/ios/condition_variable.h @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #ifndef PLATFORM_V2_IMPL_IOS_CONDITION_VARIABLE_H_ #define PLATFORM_V2_IMPL_IOS_CONDITION_VARIABLE_H_ diff --git a/cpp/platform_v2/impl/ios/count_down_latch.h b/cpp/platform_v2/impl/ios/count_down_latch.h index a06bcc45..4daef669 100644 --- a/cpp/platform_v2/impl/ios/count_down_latch.h +++ b/cpp/platform_v2/impl/ios/count_down_latch.h @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #ifndef PLATFORM_V2_IMPL_IOS_COUNT_DOWN_LATCH_H_ #define PLATFORM_V2_IMPL_IOS_COUNT_DOWN_LATCH_H_ diff --git a/cpp/platform_v2/impl/ios/log_message.h b/cpp/platform_v2/impl/ios/log_message.h index dd0a0c2a..63347dff 100644 --- a/cpp/platform_v2/impl/ios/log_message.h +++ b/cpp/platform_v2/impl/ios/log_message.h @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #ifndef PLATFORM_V2_IMPL_IOS_LOG_MESSAGE_H_ #define PLATFORM_V2_IMPL_IOS_LOG_MESSAGE_H_ diff --git a/cpp/platform_v2/impl/ios/log_message.mm b/cpp/platform_v2/impl/ios/log_message.mm index 0e6ac13c..4c8a0bf8 100644 --- a/cpp/platform_v2/impl/ios/log_message.mm +++ b/cpp/platform_v2/impl/ios/log_message.mm @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #include "platform_v2/impl/ios/log_message.h" #include diff --git a/cpp/platform_v2/impl/ios/multi_thread_executor.h b/cpp/platform_v2/impl/ios/multi_thread_executor.h index e665df62..6fba2484 100644 --- a/cpp/platform_v2/impl/ios/multi_thread_executor.h +++ b/cpp/platform_v2/impl/ios/multi_thread_executor.h @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #ifndef PLATFORM_V2_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_ #define PLATFORM_V2_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_ diff --git a/cpp/platform_v2/impl/ios/mutex.h b/cpp/platform_v2/impl/ios/mutex.h index 2986869f..a409c702 100644 --- a/cpp/platform_v2/impl/ios/mutex.h +++ b/cpp/platform_v2/impl/ios/mutex.h @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #ifndef PLATFORM_V2_IMPL_IOS_MUTEX_H_ #define PLATFORM_V2_IMPL_IOS_MUTEX_H_ diff --git a/cpp/platform_v2/impl/ios/platform.mm b/cpp/platform_v2/impl/ios/platform.mm index dabd01d4..6fa3d9f5 100644 --- a/cpp/platform_v2/impl/ios/platform.mm +++ b/cpp/platform_v2/impl/ios/platform.mm @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #include "platform_v2/api/platform.h" #include diff --git a/cpp/platform_v2/impl/ios/scheduled_executor.h b/cpp/platform_v2/impl/ios/scheduled_executor.h index 6fb08fd7..1a62f3b7 100644 --- a/cpp/platform_v2/impl/ios/scheduled_executor.h +++ b/cpp/platform_v2/impl/ios/scheduled_executor.h @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #ifndef PLATFORM_V2_IMPL_IOS_SCHEDULED_EXECUTOR_H_ #define PLATFORM_V2_IMPL_IOS_SCHEDULED_EXECUTOR_H_ diff --git a/cpp/platform_v2/impl/ios/scheduled_executor.mm b/cpp/platform_v2/impl/ios/scheduled_executor.mm index 6d850b06..a1d2f81d 100644 --- a/cpp/platform_v2/impl/ios/scheduled_executor.mm +++ b/cpp/platform_v2/impl/ios/scheduled_executor.mm @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #include "platform_v2/impl/ios/scheduled_executor.h" #include diff --git a/cpp/platform_v2/impl/ios/single_thread_executor.h b/cpp/platform_v2/impl/ios/single_thread_executor.h index be5d99e0..810f609d 100644 --- a/cpp/platform_v2/impl/ios/single_thread_executor.h +++ b/cpp/platform_v2/impl/ios/single_thread_executor.h @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #ifndef PLATFORM_V2_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_ #define PLATFORM_V2_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_ diff --git a/proto/connections/offline_wire_formats.proto b/proto/connections/offline_wire_formats.proto index c0806f85..49be9e8c 100644 --- a/proto/connections/offline_wire_formats.proto +++ b/proto/connections/offline_wire_formats.proto @@ -286,9 +286,6 @@ message LocationHint { optional LocationStandard.Format format = 2; } -// Copy from -// https://source.corp.google.com/piper///depot/google3/media/webrtc/server/tachyon/proto/tachyon_enums.proto;rcl=334271491;l=10242 -// These numbers match must match the original definition. message LocationStandard { enum Format { UNKNOWN = 0;