Merge remote-tracking branch 'sebastien/bugfix-14326_6.7' into bugfix-14326

livecodesebastien · livecodesebastien · commit e5f4f0b5ade1 · 2015-03-25T12:15:47.000Z
Conflicts:
	libexternal/src/external.c
diff --git a/revdb/Android.mk b/revdb/Android.mk
@@ -24,7 +24,9 @@ LOCAL_STATIC_LIBRARIES := libexternal
 LOCAL_LDLIBS += -lz -llog \
 	 $(call host-path,$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(TARGET_ARCH_ABI)/libstdc++.a)
 
-LOCAL_LDFLAGS += -Wl,-u,getXtable
+# SN-2015-03-25: [[ Bug 14326 ]] Add the symbol to allow the mobile externals to access
+#  the external interface version setting function
+LOCAL_LDFLAGS += -Wl,-u,getXtable -Wl,-u,setExternalInterfaceVersion -Wl,u,configureSecurity
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/revdb/revdb-mobile.xcodeproj/project.pbxproj b/revdb/revdb-mobile.xcodeproj/project.pbxproj
@@ -446,7 +446,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export SYMBOLS=_getXtable\nsh \"$SRCROOT/../tools/build-extension-ios.sh\"";
+			shellScript = "export SYMBOLS=\"_getXtable _configureSecurity _setExternalInterfaceVersion\"\nsh \"$SRCROOT/../tools/build-extension-ios.sh\"";
 			showEnvVarsInLog = 0;
 		};
 		4DA0BA7E12E842B500B4F692 /* Build External */ = {
diff --git a/revxml/Android.mk b/revxml/Android.mk
@@ -23,6 +23,8 @@ LOCAL_STATIC_LIBRARIES := libexternal libxslt libxml
 LOCAL_LDLIBS += -lz \
 	$(call host-path,$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(TARGET_ARCH_ABI)/libstdc++.a)
 
-LOCAL_LDFLAGS += -Wl,-u,getXtable
+# SN-2015-03-25: [[ Bug 14326 ]] Add the symbol to allow the mobile externals to access
+#  the external interface version setting function
+LOCAL_LDFLAGS += -Wl,-u,getXtable -Wl,-u,setExternalInterfaceVersion -Wl,u,configureSecurity
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/revxml/revxml-mobile.xcodeproj/project.pbxproj b/revxml/revxml-mobile.xcodeproj/project.pbxproj
@@ -21,7 +21,7 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 4DE75F2A17E0995F00832B1D /* libxslt-mobile.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = 4D7EFD7912E72ABA00D67888 /* xslt */;
+			remoteGlobalIDString = 4D7EFD7912E72ABA00D67888;
 			remoteInfo = xslt;
 		};
 		4D379C911714207A00B9037C /* PBXContainerItemProxy */ = {
@@ -201,6 +201,8 @@
 /* Begin PBXProject section */
 		4D7EFD3A12E72A1C00D67888 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = 4D7EFD3D12E72A1C00D67888 /* Build configuration list for PBXProject "revxml-mobile" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
@@ -275,7 +277,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export SYMBOLS=_getXtable\nsh \"$SRCROOT/../tools/build-extension-ios.sh\"";
+			shellScript = "export SYMBOLS=\"_getXtable _configureSecurity _setExternalInterfaceVersion\"\nsh \"$SRCROOT/../tools/build-extension-ios.sh\"";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/revzip/Android.mk b/revzip/Android.mk
@@ -21,7 +21,9 @@ LOCAL_STATIC_LIBRARIES := libexternal libzip
 
 LOCAL_LDLIBS += -lz \
 	$(call host-path,$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(TARGET_ARCH_ABI)/libstdc++.a)
-
-LOCAL_LDFLAGS += -Wl,-u,getXtable
+	
+# SN-2015-03-25: [[ Bug 14326 ]] Add the symbol to allow the mobile externals to access
+#  the external interface version setting function
+LOCAL_LDFLAGS += -Wl,-u,getXtable -Wl,-u,setExternalInterfaceVersion -Wl,u,configureSecurity
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/revzip/revzip-mobile.xcodeproj/project.pbxproj b/revzip/revzip-mobile.xcodeproj/project.pbxproj
@@ -169,6 +169,8 @@
 /* Begin PBXProject section */
 		4D7EFD3A12E72A1C00D67888 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = 4D7EFD3D12E72A1C00D67888 /* Build configuration list for PBXProject "revzip-mobile" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
@@ -232,7 +234,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export SYMBOLS=_getXtable\nsh \"$SRCROOT/../tools/build-extension-ios.sh\"";
+			shellScript = "export SYMBOLS=\"_getXtable _configureSecurity _setExternalInterfaceVersion\"\nsh \"$SRCROOT/../tools/build-extension-ios.sh\"";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
