added delay inside the mainloop, it is ok for L, not for M; it is better

ggfan · ggfan · commit f56a942454d6 · 2015-08-30T20:55:41.000-07:00
diff --git a/samples-android/ButtonClicker/AndroidManifest.xml b/samples-android/ButtonClicker/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.example.games.bc3"
+    package="com.google.example.games.bc3.fix"
     android:versionCode="1"
     android:versionName="1.0" >
     
     <uses-sdk
         android:minSdkVersion="11"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="22" />
 
     <uses-feature android:glEsVersion="0x00020000" >
     </uses-feature>
@@ -47,4 +47,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
+</manifest>
diff --git a/samples-android/ButtonClicker/jni/Application.mk b/samples-android/ButtonClicker/jni/Application.mk
@@ -1,7 +1,7 @@
-APP_PLATFORM := android-9
+APP_PLATFORM := android-22
 #APP_ABI := all
 APP_ABI := armeabi-v7a
-#,arm64-v8a
+#APP_STL := arm64-v8a
 
 APP_STL := c++_static
 
diff --git a/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp b/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp
@@ -296,6 +296,15 @@ void android_main(android_app *state) {
   // Init play game services
   g_engine.InitGooglePlayGameServices();
 
+    //let's wait here...
+  {
+    int count = 50;
+    while(count--) {
+      std::chrono::milliseconds d(100);
+      std::this_thread::sleep_for(d);
+    }
+    LOGI("=====Spin Waiting done for gpg service");
+  }
   state->userData = &g_engine;
   state->onAppCmd = Engine::HandleCmd;
   state->onInputEvent = Engine::HandleInput;
diff --git a/samples-android/ButtonClicker/res/values/strings.xml b/samples-android/ButtonClicker/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <string name="app_name">ButtonClicker</string>
-    <string name="app_id">REPLACE_ME</string>
+    <string name="app_name">ButtonClicker_ndk</string>
+    <string name="app_id">953759410967</string>
 
 </resources>
diff --git a/samples-android/build.sh b/samples-android/build.sh
@@ -4,11 +4,11 @@ set -eua
 # List of targets to build. Interpreted as directories relative to
 # this script's path.
 declare targets=(           \
-  CollectAllTheStarsNative  \
-  Minimalist                \
-  TbmpSkeletonNative        \
-  Teapot                    \
-  TrivialQuestNative        \
+#  CollectAllTheStarsNative  \
+#  Minimalist                \
+#  TbmpSkeletonNative        \
+#  Teapot                    \
+#  TrivialQuestNative        \
   ButtonClicker             \
 )
 
diff --git a/samples-android/build_sample.sh b/samples-android/build_sample.sh
@@ -104,7 +104,7 @@ trap cleanup EXIT
 # Copy the lib project and run "android update lib-project" on it.
 # This requires a target, which apparently needs to be android-10.
 cp -r ${lib_project} ${private_lib}
-${android_tool} update lib-project --path ${private_lib} --target android-10
+${android_tool} update lib-project --path ${private_lib} --target android-22
 
 #
 # At last, build!

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ trap cleanup EXIT`
`104`	`104`	`# Copy the lib project and run "android update lib-project" on it.`
`105`	`105`	`# This requires a target, which apparently needs to be android-10.`
`106`	`106`	`cp -r ${lib_project} ${private_lib}`
`107`		`-${android_tool} update lib-project --path ${private_lib} --target android-10`
	`107`	`+${android_tool} update lib-project --path ${private_lib} --target android-22`
`108`	`108`
`109`	`109`	`#`
`110`	`110`	`# At last, build!`