From 8ff0d0d436b4fd9fd4199d313f708377c7a668af Mon Sep 17 00:00:00 2001
From: Jakob Buchgraber <buchgr@google.com>
Date: Fri, 14 Apr 2017 21:16:19 +0200
Subject: Revert "protobuf: Update protobuf to @laszlocsomor's master at commit
 421d909."

This reverts commit 5235d06159ba6fee412bee261ea7867d061252b0.

Unfortunately, we noticed several build errors / test failures internally due this
change.
---
 .../xcschemes/PerformanceTests.xcscheme            | 345 ---------------------
 .../xcschemes/ProtocolBuffers.xcscheme             | 134 --------
 2 files changed, 479 deletions(-)
 delete mode 100644 third_party/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
 delete mode 100644 third_party/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme

(limited to 'third_party/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes')

diff --git a/third_party/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme b/third_party/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
deleted file mode 100644
index be31c30831..0000000000
--- a/third_party/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0800"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-               BuildableName = "libProtocolBuffers.a"
-               BlueprintName = "ProtocolBuffers"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "CodedInputStreamTests">
-               </Test>
-               <Test
-                  Identifier = "CodedOutputStreamTests">
-               </Test>
-               <Test
-                  Identifier = "ConcurrencyTests">
-               </Test>
-               <Test
-                  Identifier = "DescriptorTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolBoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolDoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolFloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolUInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolUInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBridgeTests">
-               </Test>
-               <Test
-                  Identifier = "GPBDoubleArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBEnumArrayCustomTests">
-               </Test>
-               <Test
-                  Identifier = "GPBEnumArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBFloatArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBObjectiveCPlusPlusTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringBoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringDoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringEnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringEnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringFloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringUInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringUInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBTestCase">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "MessageMergeTests">
-               </Test>
-               <Test
-                  Identifier = "MessageRuntimeTests">
-               </Test>
-               <Test
-                  Identifier = "MessageSerializationTests">
-               </Test>
-               <Test
-                  Identifier = "MessageTests">
-               </Test>
-               <Test
-                  Identifier = "UnknownFieldSetTest">
-               </Test>
-               <Test
-                  Identifier = "UtilitiesTests">
-               </Test>
-               <Test
-                  Identifier = "WellKnownTypesTest">
-               </Test>
-               <Test
-                  Identifier = "WireFormatTests">
-               </Test>
-            </SkippedTests>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8B9A5EA41831993600A9D33B"
-            BuildableName = "iOSTestHarness.app"
-            BlueprintName = "iOSTestHarness"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8B9A5EA41831993600A9D33B"
-            BuildableName = "iOSTestHarness.app"
-            BlueprintName = "iOSTestHarness"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Release">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/third_party/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme b/third_party/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
deleted file mode 100644
index edbe689822..0000000000
--- a/third_party/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0800"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "NO">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-               BuildableName = "libProtocolBuffers.a"
-               BlueprintName = "ProtocolBuffers"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F4487C551A9F8F8100531423"
-               BuildableName = "libTestSingleSourceBuild.a"
-               BlueprintName = "TestSingleSourceBuild"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "PerfTests">
-               </Test>
-            </SkippedTests>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8B9A5EA41831993600A9D33B"
-            BuildableName = "iOSTestHarness.app"
-            BlueprintName = "iOSTestHarness"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8B9A5EA41831993600A9D33B"
-            BuildableName = "iOSTestHarness.app"
-            BlueprintName = "iOSTestHarness"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
-- 
cgit v1.2.3