[ios] Fix code signing support for Xcode 10 xctests.

BUG: 843236
Change-Id: I210265af65409181b095bbd6a00da530759fead4
Reviewed-on: https://chromium-review.googlesource.com/1140922Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576084}

build/config/ios/codesign.py

@@ -243,12 +243,15 @@ def InstallSystemFramework(framework_path, bundle_path, args):
   installed_framework_path = os.path.join(
       bundle_path, 'Frameworks', os.path.basename(framework_path))
 
-  if os.path.exists(installed_framework_path):
-    shutil.rmtree(installed_framework_path)
+  if os.path.isfile(framework_path):
+    shutil.copy(framework_path, installed_framework_path)
+  elif os.path.isdir(framework_path):
+    if os.path.exists(installed_framework_path):
+      shutil.rmtree(installed_framework_path)
+    shutil.copytree(framework_path, installed_framework_path)
 
-  shutil.copytree(framework_path, installed_framework_path)
   CodeSignBundle(installed_framework_path, args.identity,
-      ['--deep', '--preserve-metadata=identifier,entitlements'])
+      ['--deep', '--preserve-metadata=identifier,entitlements,flags'])
 
 
 def GenerateEntitlements(path, provisioning_profile, bundle_identifier):

build/config/ios/rules.gni

@@ -1809,7 +1809,11 @@ template("ios_xctest_test") {
         [ "$_ios_platform_library/Frameworks/XCTest.framework" ]
 
     # TODO: Remove this once support for Xcode 9.x is dropped.
-    if (xcode_version_int < 1000) {
+    if (xcode_version_int >= 1000) {
+      extra_system_frameworks += [
+        "$ios_sdk_platform_path/Developer/usr/lib/libXCTestBundleInject.dylib",
+      ]
+    } else {
       extra_system_frameworks += [
         "$_ios_platform_library/PrivateFrameworks/IDEBundleInjection.framework",
       ]