Merge branch 'google3'

Change-Id: Ibebf84b98939ee8e5006beedc34d225e8c2dd413

cpp/platform/CMakeLists.txt

@@ -1,11 +1,14 @@
 add_library(platform_utils STATIC
-  base64_utils.cc
-  file_impl.cc
-  prng.cc
-  reliability_utils.cc
 )
 
 target_sources(platform_utils
+  PRIVATE
+    base64_utils.cc
+    cancelable_alarm.cc
+    file_impl.cc
+    pipe.cc
+    prng.cc
+    reliability_utils.cc
   PUBLIC
     base64_utils.h
     cancelable_alarm.h
@@ -18,8 +21,11 @@ target_sources(platform_utils
 
 target_link_libraries(platform_utils
   PUBLIC
-    platform_types
     platform_api
+    platform_types
+    platform_impl_g3
+    platform_impl_shared_posix_lock
+    platform_impl_shared_posix_condition_variable
     absl::strings
 )
 
@@ -62,8 +68,7 @@ target_link_libraries(platform_test
     gtest
     gtest_main
     platform_api
-    platform_impl_default_cond_var
-    platform_impl_default_lock
+    platform_impl_g3
     platform_types
     platform_utils
 )
@@ -74,7 +79,6 @@ add_test(
 )
 
 add_subdirectory(api)
-add_subdirectory(api2)
-add_subdirectory(impl/sample)
-add_subdirectory(impl/default)
+add_subdirectory(impl/g3)
+add_subdirectory(impl/shared)
 add_subdirectory(port)