Fixed compile errors

build/cocos2d_tests.xcodeproj/project.pbxproj

@@ -986,8 +986,6 @@
 		FADEC3701ADCE3350018F90E /* Test_Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FADEC36A1ADCE3350018F90E /* Test_Info.plist */; };
 		FADEC3721ADCE3590018F90E /* src in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3711ADCE3590018F90E /* src */; };
 		FADEC3731ADCE3590018F90E /* src in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3711ADCE3590018F90E /* src */; };
-		FADEC3751ADCE3630018F90E /* res in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3741ADCE3620018F90E /* res */; };
-		FADEC3761ADCE3630018F90E /* res in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3741ADCE3620018F90E /* res */; };
 		FADEC3781ADCE39C0018F90E /* script in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3771ADCE39C0018F90E /* script */; };
 		FADEC3791ADCE39C0018F90E /* script in Resources */ = {isa = PBXBuildFile; fileRef = FADEC3771ADCE39C0018F90E /* script */; };
 		FADEC37E1ADCE52F0018F90E /* libjscocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FADEB2311ADCE2050018F90E /* libjscocos2d iOS.a */; };
@@ -2022,7 +2020,6 @@
 		FADEC36A1ADCE3350018F90E /* Test_Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Test_Info.plist; sourceTree = "<group>"; };
 		FADEC36B1ADCE3350018F90E /* Test_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Test_Prefix.pch; sourceTree = "<group>"; };
 		FADEC3711ADCE3590018F90E /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; path = src; sourceTree = "<group>"; };
-		FADEC3741ADCE3620018F90E /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; path = res; sourceTree = "<group>"; };
 		FADEC3771ADCE39C0018F90E /* script */ = {isa = PBXFileReference; lastKnownFileType = folder; name = script; path = "../../cocos/scripting/js-bindings/script"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -4312,7 +4309,6 @@
 			children = (
 				FADEB2571ADCE2A20018F90E /* project */,
 				FADEC3711ADCE3590018F90E /* src */,
-				FADEC3741ADCE3620018F90E /* res */,
 				FADEC3771ADCE39C0018F90E /* script */,
 				FADEB2551ADCE2A20018F90E /* main.js */,
 				FADEB3A21ADCE2A30018F90E /* project.json */,
@@ -5053,7 +5049,6 @@
 				FADEB19F1ADCE1600018F90E /* TerrainTest in Resources */,
 				FADEC36C1ADCE3350018F90E /* InfoPlist.strings in Resources */,
 				FADEB1A01ADCE1600018F90E /* Particle3D in Resources */,
-				FADEC3751ADCE3630018F90E /* res in Resources */,
 				FADEB1A11ADCE1600018F90E /* Manifests in Resources */,
 				FADEB1A21ADCE1600018F90E /* ActionTimeline in Resources */,
 				FADEB1A31ADCE1600018F90E /* src in Resources */,
@@ -5159,7 +5154,6 @@
 				FADEB2101ADCE1CF0018F90E /* effect1.raw in Resources */,
 				FADEB2111ADCE1CF0018F90E /* Shaders in Resources */,
 				FADEB2121ADCE1CF0018F90E /* configs in Resources */,
-				FADEC3761ADCE3630018F90E /* res in Resources */,
 				FADEB2131ADCE1CF0018F90E /* spine in Resources */,
 				FADEC3731ADCE3590018F90E /* src in Resources */,
 				FADEC35A1ADCE3280018F90E /* Icon-144.png in Resources */,

tests/js-tests/project/Classes/AppDelegate.cpp

@@ -27,11 +27,6 @@
 #include "cocosbuilder/js_bindings_ccbreader.h"
 #include "js_DrawNode3D_bindings.h"
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-#include "jsb_cocos2dx_pluginx_auto.hpp"
-#include "jsb_pluginx_extension_registration.h"
-#endif
-
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
 #include "platform/android/CCJavascriptJavaBridge.h"
 #elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
@@ -110,11 +105,6 @@ bool AppDelegate::applicationDidFinishLaunching()
     
     sc->addRegisterCallback(register_all_cocos2dx_3d_extension);
     
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-    sc->addRegisterCallback(register_all_pluginx_protocols);
-    sc->addRegisterCallback(register_pluginx_js_extensions);
-#endif
-    
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     sc->addRegisterCallback(JavascriptJavaBridge::_js_register);
 #elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)

tests/js-tests/project/proj.android/AndroidManifest.xml

@@ -13,9 +13,6 @@
 	      <!-- Tell NativeActivity the name of our .so -->
         <meta-data android:name="android.app.lib_name" android:value="js_tests" />
         
-	    <!-- facebook test-->
-	    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/app_id" />
-
         <activity android:name=".AppActivity"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
@@ -27,27 +24,18 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.facebook.LoginActivity"
-                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
-                  android:label="@string/app_name" />
-        <provider android:authorities="com.facebook.app.NativeAppCallContentProvider1426774790893461"
-                  android:name="com.facebook.NativeAppCallContentProvider"
-                  android:exported="true"/>
 
-        <meta-data android:value="50d2af93527015338b000052" android:name="UMENG_APPKEY"></meta-data>
     </application>
     <supports-screens android:anyDensity="true"
                       android:smallScreens="true"
                       android:normalScreens="true"
                       android:largeScreens="true"
                       android:xlargeScreens="true"/>
+    
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_LOGS" />
-
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 

tests/js-tests/project/proj.android/build-cfg.json

@@ -4,10 +4,6 @@
             "from": "../../src", 
             "to": "src"
         }, 
-        {
-            "from": "../../res", 
-            "to": "res"
-        }, 
         {
             "from": "../../../cpp-tests/Resources/", 
             "to": "res/"
@@ -23,38 +19,6 @@
         {
             "from": "../../../../cocos/scripting/js-bindings/script", 
             "to": "script"
-        },
-        {
-            "from": "../../../../plugin/jsbindings/script", 
-            "to": ""
-        }, 
-        {
-            "from": "../../../../plugin/protocols/proj.android/src", 
-            "to": "../src"
-        }, 
-        {
-            "from": "../../../../plugin/plugins/umeng/proj.android/src", 
-            "to": "../src"
-        }, 
-        {
-            "from": "../../../../plugin/plugins/umeng/proj.android/sdk", 
-            "to": "../libs"
-        }, 
-        {
-            "from": "../../../../plugin/plugins/flurry/proj.android/src", 
-            "to": "../src"
-        }, 
-        {
-            "from": "../../../../plugin/plugins/flurry/proj.android/sdk", 
-            "to": "../libs"
-        },
-        {
-            "from": "../../../../plugin/plugins/facebook/proj.android/src", 
-            "to": "../src"
-        }, 
-        {
-            "from": "../../../../plugin/plugins/facebook/proj.android/sdk", 
-            "to": "../libs"
         }
     ], 
     "ndk_module_path": [

tests/js-tests/project/proj.android/src/org/cocos2dx/js_tests/AppActivity.java

@@ -27,8 +27,6 @@ import org.cocos2dx.js_tests.R;
 import org.cocos2dx.lib.Cocos2dxActivity;
 import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
 import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
-import org.cocos2dx.plugin.PluginWrapper;
-import org.cocos2dx.plugin.FacebookWrapper;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -51,10 +49,6 @@ public class AppActivity extends Cocos2dxActivity {
         // TestCpp should create stencil buffer
         glSurfaceView.setEGLConfigChooser(5, 6, 5, 0, 16, 8);
         
-        PluginWrapper.init(this);
-        PluginWrapper.setGLSurfaceView(glSurfaceView);
-        FacebookWrapper.onCreate(this);
-        
         return glSurfaceView;
     }
     
@@ -83,15 +77,4 @@ public class AppActivity extends Cocos2dxActivity {
         });
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        FacebookWrapper.onAcitivityResult(requestCode, resultCode, data);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        FacebookWrapper.onSaveInstanceState(outState);
-    }
 }