commit 1b8254bb2df9cedb4d27a02194966eb9d4968b63
author nglevin <nglevin@google.com> Thu Mar 15 16:18:58 2018 -0700
committer Nicholas <nglevin@google.com> Wed Mar 21 11:49:18 2018 -0700
tree 7ea44675a96101447c4c4e198ffb09c5c5a0380e
parent f63cbe0d0291e9e27c85ddbde1742f3a6820cbbc

Turn off TULSI_APFS_CLONE for Xcode < 9.

This codepath creates a symlink in our dSYM bundles which
post_processor will try to patch unsuccessfully.

PiperOrigin-RevId: 189263902

src/TulsiGenerator/Scripts/apfs_clone_copy.py

diff --git a/src/TulsiGenerator/Scripts/apfs_clone_copy.py b/src/TulsiGenerator/Scripts/apfs_clone_copy.py
index 4492b38..b86d3a6 100644
--- a/src/TulsiGenerator/Scripts/apfs_clone_copy.py
+++ b/src/TulsiGenerator/Scripts/apfs_clone_copy.py
@@ -67,6 +67,8 @@
   if tree:
     # Copy recursively if indicated.
     cmd.append('-R')
+    # Follow symlinks, emulating shutil.copytree defaults.
+    cmd.append('-L')
   # Preserve all possible file attributes and permissions (copystat/copy2).
   cmd.extend(['-p', source, dest])
   try:

src/TulsiGenerator/Scripts/bazel_build.py

diff --git a/src/TulsiGenerator/Scripts/bazel_build.py b/src/TulsiGenerator/Scripts/bazel_build.py
index 875e6d9..9dc90ca 100755
--- a/src/TulsiGenerator/Scripts/bazel_build.py
+++ b/src/TulsiGenerator/Scripts/bazel_build.py
@@ -504,8 +504,18 @@
     if not self.xcode_action:
       self.xcode_action = 'build'
 
+    self.xcode_version_major = int(os.environ['XCODE_VERSION_MAJOR'])
+    self.xcode_version_minor = int(os.environ['XCODE_VERSION_MINOR'])
+
     self.tulsi_version = os.environ.get('TULSI_VERSION', 'UNKNOWN')
-    self.apfs_clone = os.environ.get('TULSI_APFS_CLONE', 'NO') == 'YES'
+
+    self.use_post_processor = self.xcode_version_major < 900
+
+    if self.use_post_processor:
+      self.apfs_clone = False
+    else:
+      self.apfs_clone = os.environ.get('TULSI_APFS_CLONE', 'NO') == 'YES'
+
     self.generate_dsym = (os.environ.get('TULSI_ALL_DSYM', 'NO') == 'YES' or
                           os.environ.get('TULSI_MUST_USE_DSYM', 'NO') == 'YES')
     self.use_debug_prefix_map = os.environ.get('TULSI_DEBUG_PREFIX_MAP',
@@ -550,8 +560,6 @@
     # single file targets (like static libraries).
     self.wrapper_name = os.environ.get('WRAPPER_NAME')
     self.wrapper_suffix = os.environ.get('WRAPPER_SUFFIX', '')
-    self.xcode_version_major = int(os.environ['XCODE_VERSION_MAJOR'])
-    self.xcode_version_minor = int(os.environ['XCODE_VERSION_MINOR'])
 
     # Path where Xcode expects the artifacts to be written to. This is not the
     # codesigning_path as device vs simulator builds have different signing
@@ -698,7 +706,7 @@
       for path in dsym_paths:
         # Starting with Xcode 9.x, a plist based solution exists for dSYM
         # bundles that works with Swift as well as (Obj-)C(++).
-        if self.xcode_version_major >= 900:
+        if not self.use_post_processor:
           timer = Timer('Adding remappings as plists to dSYM',
                         'plist_dsym').Start()
           exit_code = self._PlistdSYMPaths(path)