From f0d1df426f638932ffe40bf81d4c7958346ac431 Mon Sep 17 00:00:00 2001
From: zhangbin <zhangbin@cocos2d-x.org>
Date: Wed, 26 Jun 2013 14:14:40 +0800
Subject: [PATCH] Modify the min sdk version of android platform required in
 plugin samples.

---
 plugin/jsbindings/manual/jsb_pluginx_manual_protocols.cpp     | 4 ++--
 plugin/samples/HelloAds/proj.android/AndroidManifest.xml      | 4 ++--
 .../HelloAnalytics-JS/proj.android/AndroidManifest.xml        | 2 +-
 .../samples/HelloAnalytics-JS/proj.android/project.properties | 2 +-
 .../samples/HelloAnalytics/proj.android/AndroidManifest.xml   | 2 +-
 plugin/samples/HelloAnalytics/proj.android/project.properties | 2 +-
 plugin/samples/HelloIAP-JS/proj.android/AndroidManifest.xml   | 2 +-
 plugin/samples/HelloIAP-JS/proj.android/project.properties    | 2 +-
 plugin/samples/HelloIAP/proj.android/AndroidManifest.xml      | 2 +-
 plugin/samples/HelloIAP/proj.android/project.properties       | 2 +-
 plugin/samples/HelloShare/proj.android/AndroidManifest.xml    | 2 +-
 plugin/samples/HelloShare/proj.android/project.properties     | 2 +-
 plugin/samples/HelloUser/proj.android/AndroidManifest.xml     | 4 ++--
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/plugin/jsbindings/manual/jsb_pluginx_manual_protocols.cpp b/plugin/jsbindings/manual/jsb_pluginx_manual_protocols.cpp
index b01c50110b..b2b6fb5281 100644
--- a/plugin/jsbindings/manual/jsb_pluginx_manual_protocols.cpp
+++ b/plugin/jsbindings/manual/jsb_pluginx_manual_protocols.cpp
@@ -224,9 +224,9 @@ JSBool js_pluginx_PluginProtocol_callStringFuncWithParam(JSContext *cx, uint32_t
         JSObject *obj = JS_THIS_OBJECT(cx, vp);
         js_proxy_t *proxy; JS_GET_NATIVE_PROXY(proxy, obj);
         cocos2d::plugin::PluginProtocol* cobj = (cocos2d::plugin::PluginProtocol *)(proxy ? proxy->ptr : NULL);
-        const char* ret = cobj->callStringFuncWithParam(strName.c_str(), params).c_str();
+        std::string ret = cobj->callStringFuncWithParam(strName.c_str(), params);
 		jsval jsret;
-		jsret = c_string_to_jsval(cx, ret);
+		jsret = std_string_to_jsval(cx, ret);
 		JS_SET_RVAL(cx, vp, jsret);
 		return JS_TRUE;
 	}
diff --git a/plugin/samples/HelloAds/proj.android/AndroidManifest.xml b/plugin/samples/HelloAds/proj.android/AndroidManifest.xml
index 851b907ad6..804a1bc20a 100644
--- a/plugin/samples/HelloAds/proj.android/AndroidManifest.xml
+++ b/plugin/samples/HelloAds/proj.android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.cocos2dx.HelloAds" android:versionCode="1" android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="9" />
     <uses-feature android:glEsVersion="0x00020000" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name">
@@ -18,4 +18,4 @@
                          
     <uses-permission android:name="android.permission.INTERNET" />
 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    </manifest>
\ No newline at end of file
+    </manifest>
diff --git a/plugin/samples/HelloAnalytics-JS/proj.android/AndroidManifest.xml b/plugin/samples/HelloAnalytics-JS/proj.android/AndroidManifest.xml
index 57119a6dcf..db2ddeda1b 100644
--- a/plugin/samples/HelloAnalytics-JS/proj.android/AndroidManifest.xml
+++ b/plugin/samples/HelloAnalytics-JS/proj.android/AndroidManifest.xml
@@ -4,7 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="8"/>
+    <uses-sdk android:minSdkVersion="9"/>
 
     <application android:label="@string/app_name"
         android:debuggable="true"
diff --git a/plugin/samples/HelloAnalytics-JS/proj.android/project.properties b/plugin/samples/HelloAnalytics-JS/proj.android/project.properties
index 859630e465..11b1d3fbfc 100644
--- a/plugin/samples/HelloAnalytics-JS/proj.android/project.properties
+++ b/plugin/samples/HelloAnalytics-JS/proj.android/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-8
+target=android-9
 android.library.reference.1=../../../../cocos2dx/platform/android/java
diff --git a/plugin/samples/HelloAnalytics/proj.android/AndroidManifest.xml b/plugin/samples/HelloAnalytics/proj.android/AndroidManifest.xml
index a981cdb8ed..eb2eb922e3 100644
--- a/plugin/samples/HelloAnalytics/proj.android/AndroidManifest.xml
+++ b/plugin/samples/HelloAnalytics/proj.android/AndroidManifest.xml
@@ -4,7 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="8"/>
+    <uses-sdk android:minSdkVersion="9"/>
 
     <application android:label="@string/app_name"
         android:debuggable="true"
diff --git a/plugin/samples/HelloAnalytics/proj.android/project.properties b/plugin/samples/HelloAnalytics/proj.android/project.properties
index 859630e465..11b1d3fbfc 100644
--- a/plugin/samples/HelloAnalytics/proj.android/project.properties
+++ b/plugin/samples/HelloAnalytics/proj.android/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-8
+target=android-9
 android.library.reference.1=../../../../cocos2dx/platform/android/java
diff --git a/plugin/samples/HelloIAP-JS/proj.android/AndroidManifest.xml b/plugin/samples/HelloIAP-JS/proj.android/AndroidManifest.xml
index 3c1db3bc21..2d3fafcf46 100755
--- a/plugin/samples/HelloIAP-JS/proj.android/AndroidManifest.xml
+++ b/plugin/samples/HelloIAP-JS/proj.android/AndroidManifest.xml
@@ -4,7 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="8"/>
+    <uses-sdk android:minSdkVersion="9"/>
 
     <application android:label="@string/app_name"
         android:debuggable="true"
diff --git a/plugin/samples/HelloIAP-JS/proj.android/project.properties b/plugin/samples/HelloIAP-JS/proj.android/project.properties
index 3fa9c97766..65bf166dea 100755
--- a/plugin/samples/HelloIAP-JS/proj.android/project.properties
+++ b/plugin/samples/HelloIAP-JS/proj.android/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-8
+target=android-9
 android.library.reference.1=../../../../cocos2dx/platform/android/java
 android.library.reference.2=../../../publish/plugins/nd91/android/DependProject
diff --git a/plugin/samples/HelloIAP/proj.android/AndroidManifest.xml b/plugin/samples/HelloIAP/proj.android/AndroidManifest.xml
index c6fb07ce2a..0c9510d06c 100644
--- a/plugin/samples/HelloIAP/proj.android/AndroidManifest.xml
+++ b/plugin/samples/HelloIAP/proj.android/AndroidManifest.xml
@@ -4,7 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="8"/>
+    <uses-sdk android:minSdkVersion="9"/>
 
     <application android:label="@string/app_name"
         android:debuggable="true"
diff --git a/plugin/samples/HelloIAP/proj.android/project.properties b/plugin/samples/HelloIAP/proj.android/project.properties
index 3fa9c97766..65bf166dea 100644
--- a/plugin/samples/HelloIAP/proj.android/project.properties
+++ b/plugin/samples/HelloIAP/proj.android/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-8
+target=android-9
 android.library.reference.1=../../../../cocos2dx/platform/android/java
 android.library.reference.2=../../../publish/plugins/nd91/android/DependProject
diff --git a/plugin/samples/HelloShare/proj.android/AndroidManifest.xml b/plugin/samples/HelloShare/proj.android/AndroidManifest.xml
index 0dbcb2eca8..1ef3dff85e 100755
--- a/plugin/samples/HelloShare/proj.android/AndroidManifest.xml
+++ b/plugin/samples/HelloShare/proj.android/AndroidManifest.xml
@@ -4,7 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="8"/>
+    <uses-sdk android:minSdkVersion="9"/>
 
     <application android:label="@string/app_name"
         android:debuggable="true"
diff --git a/plugin/samples/HelloShare/proj.android/project.properties b/plugin/samples/HelloShare/proj.android/project.properties
index 859630e465..11b1d3fbfc 100755
--- a/plugin/samples/HelloShare/proj.android/project.properties
+++ b/plugin/samples/HelloShare/proj.android/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-8
+target=android-9
 android.library.reference.1=../../../../cocos2dx/platform/android/java
diff --git a/plugin/samples/HelloUser/proj.android/AndroidManifest.xml b/plugin/samples/HelloUser/proj.android/AndroidManifest.xml
index 7781b4c114..5967950d64 100644
--- a/plugin/samples/HelloUser/proj.android/AndroidManifest.xml
+++ b/plugin/samples/HelloUser/proj.android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.cocos2dx.HelloUser" android:versionCode="1" android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="9" />
     <uses-feature android:glEsVersion="0x00020000" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name">
@@ -38,4 +38,4 @@
         <uses-permission android:name="android.permission.GET_TASKS" />
         <uses-permission android:name="android.permission.READ_SMS" />
         <uses-permission android:name="android.permission.WAKE_LOCK" />
-    </manifest>
\ No newline at end of file
+    </manifest>