[google][tagmanager] Moved GoogleSymbolUtilities from Firebase.Core t…

…o Google.TagManager
RonnyRos · Jul 12, 2017 · d7c93f9 · d7c93f9
1 parent 92c1984
commit d7c93f9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 28 deletions.
diff --git a/Firebase.Core/source/Firebase.Core/Firebase.Core.targets b/Firebase.Core/source/Firebase.Core/Firebase.Core.targets
@@ -3,45 +3,25 @@
 	<PropertyGroup>
 		<_FirebaseCoreAssemblyName>Firebase.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</_FirebaseCoreAssemblyName>
 		<_FirebaseCoreItemsFolder>FCr-3.5.2</_FirebaseCoreItemsFolder>
-		<_GoogleSymbolUtilitiesItemsFolder>GSymblU-1.1.2</_GoogleSymbolUtilitiesItemsFolder>
-		<_GoogleInterchangeUtilitiesItemsFolder>GIntrchngU-1.2.2</_GoogleInterchangeUtilitiesItemsFolder>
 	</PropertyGroup>
 	<ItemGroup Condition="('$(OutputType)'!='Library' OR '$(IsAppExtension)'=='True')">
 		<XamarinBuildDownload Include="$(_FirebaseCoreItemsFolder)">
 			<Url>https://dl.google.com/dl/cpdc/6cef90b86eee4f08/FirebaseCore-3.5.2.tar.gz</Url>
 			<Kind>Tgz</Kind>
 		</XamarinBuildDownload>
-		<XamarinBuildDownload Include="$(_GoogleSymbolUtilitiesItemsFolder)">
-            <Url>https://dl.google.com/dl/cpdc/7ecdffda6fbef4af/GoogleSymbolUtilities-1.1.2.tar.gz</Url>
-            <Kind>Tgz</Kind>
-        </XamarinBuildDownload>
-		<XamarinBuildDownload Include="$(_GoogleInterchangeUtilitiesItemsFolder)">
-            <Url>https://dl.google.com/dl/cpdc/1a7f7ba905b2c029/GoogleInterchangeUtilities-1.2.2.tar.gz</Url>
-            <Kind>Tgz</Kind>
-        </XamarinBuildDownload>
 		<XamarinBuildRestoreResources Include="_FirebaseCoreItemsFolder" />
 	</ItemGroup>
 	<Target Name="_FirebaseCoreItemsFolder">
 
 		<PropertyGroup>
 			<_FirebaseCoreSDKBaseFolder>$(XamarinBuildDownloadDir)$(_FirebaseCoreItemsFolder)\Frameworks\</_FirebaseCoreSDKBaseFolder>
-			<_GoogleSymbolUtilitiesSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleSymbolUtilitiesItemsFolder)\Frameworks\frameworks\</_GoogleSymbolUtilitiesSDKBaseFolder>
-			<_GoogleInterchangeUtilitiesSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleInterchangeUtilitiesItemsFolder)\Frameworks\frameworks\</_GoogleInterchangeUtilitiesSDKBaseFolder>
 		</PropertyGroup>
 
 		<ItemGroup>
 			<RestoreAssemblyResource Include="$(_FirebaseCoreSDKBaseFolder)FirebaseCore.framework\FirebaseCore">
 				<LogicalName>FirebaseCore</LogicalName>
 				<AssemblyName>$(_FirebaseCoreAssemblyName)</AssemblyName>
 			</RestoreAssemblyResource>
-			<RestoreAssemblyResource Include="$(_GoogleSymbolUtilitiesSDKBaseFolder)GoogleSymbolUtilities.framework\GoogleSymbolUtilities">
-                <LogicalName>GoogleSymbolUtilities</LogicalName>
-                <AssemblyName>$(_FirebaseAnalyticsAssemblyName)</AssemblyName>
-            </RestoreAssemblyResource>
-			<RestoreAssemblyResource Include="$(_GoogleInterchangeUtilitiesSDKBaseFolder)GoogleInterchangeUtilities.framework\GoogleInterchangeUtilities">
-                <LogicalName>GoogleInterchangeUtilities</LogicalName>
-                <AssemblyName>$(_FirebaseAnalyticsAssemblyName)</AssemblyName>
-            </RestoreAssemblyResource>
 		</ItemGroup>
 
 	</Target>

diff --git a/Google.TagManager/samples/TagManagerSample/TagManagerSample/TagManagerSample.csproj b/Google.TagManager/samples/TagManagerSample/TagManagerSample/TagManagerSample.csproj
@@ -23,8 +23,6 @@
     <MtouchDebug>true</MtouchDebug>
     <MtouchFastDev>false</MtouchFastDev>
     <MtouchProfiling>true</MtouchProfiling>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>i386</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
@@ -39,8 +37,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>SdkOnly</MtouchLink>
@@ -57,8 +53,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>i386</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
@@ -78,8 +72,6 @@
     <MtouchDebug>true</MtouchDebug>
     <MtouchFastDev>false</MtouchFastDev>
     <MtouchProfiling>true</MtouchProfiling>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>SdkOnly</MtouchLink>

diff --git a/Google.TagManager/source/Google.TagManager/Google.TagManager.targets b/Google.TagManager/source/Google.TagManager/Google.TagManager.targets
@@ -5,6 +5,7 @@
 		<_GoogleTagManagerAssemblyName>Google.TagManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</_GoogleTagManagerAssemblyName>
 		<_GoogleTagManagerItemsFolder>GTagM-5.0.8</_GoogleTagManagerItemsFolder>
 		<_GoogleUtilitiesItemsFolder>GUtlts-1.3.2</_GoogleUtilitiesItemsFolder>
+		<_GoogleSymbolUtilitiesItemsFolder>GSymblU-1.1.2</_GoogleSymbolUtilitiesItemsFolder>
 	</PropertyGroup>
 
 	<ItemGroup Condition="('$(OutputType)'!='Library' OR '$(IsAppExtension)'=='True')">
@@ -16,6 +17,10 @@
 			<Url>https://dl.google.com/dl/cpdc/978f81964b50a7c0/GoogleUtilities-1.3.2.tar.gz</Url>
 			<Kind>Tgz</Kind>
 		</XamarinBuildDownload>
+		<XamarinBuildDownload Include="$(_GoogleSymbolUtilitiesItemsFolder)">
+            <Url>https://dl.google.com/dl/cpdc/7ecdffda6fbef4af/GoogleSymbolUtilities-1.1.2.tar.gz</Url>
+            <Kind>Tgz</Kind>
+        </XamarinBuildDownload>
 		<XamarinBuildRestoreResources Include="_GoogleTagManagerItems"/>
 	</ItemGroup>
 
@@ -24,6 +29,7 @@
 		<PropertyGroup>
 			<_GoogleTagManagerSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleTagManagerItemsFolder)\Frameworks\</_GoogleTagManagerSDKBaseFolder>
 			<_GoogleUtilitiesSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleUtilitiesItemsFolder)\Frameworks\frameworks\</_GoogleUtilitiesSDKBaseFolder>
+			<_GoogleSymbolUtilitiesSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleSymbolUtilitiesItemsFolder)\Frameworks\frameworks\</_GoogleSymbolUtilitiesSDKBaseFolder>
 		</PropertyGroup>
 
 		<ItemGroup>
@@ -39,6 +45,10 @@
 				<LogicalName>GoogleUtilities</LogicalName>
 				<AssemblyName>$(_GoogleTagManagerAssemblyName)</AssemblyName>
 			</RestoreAssemblyResource>
+			<RestoreAssemblyResource Include="$(_GoogleSymbolUtilitiesSDKBaseFolder)GoogleSymbolUtilities.framework\GoogleSymbolUtilities">
+                <LogicalName>GoogleSymbolUtilities</LogicalName>
+                <AssemblyName>$(_GoogleTagManagerAssemblyName)</AssemblyName>
+            </RestoreAssemblyResource>
 		</ItemGroup>
 
 	</Target>

diff --git a/Google.TagManager/source/Google.TagManager/libTagManager.linkwith.cs b/Google.TagManager/source/Google.TagManager/libTagManager.linkwith.cs
@@ -14,3 +14,8 @@
 	LinkerFlags = "-lz",
 	ForceLoad = true,
 	SmartLink = true)]
+
+[assembly: LinkWith ("GoogleSymbolUtilities",
+	LinkTarget.ArmV7 | LinkTarget.Simulator | LinkTarget.Simulator64 | LinkTarget.Arm64,
+	ForceLoad = true,
+	SmartLink = true)]