@@ -1,42 +1,53 @@
+/*
+ * Copyright 2017 (C) Google LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 apply plugin: 'com.android.application'
 
-// Depend on another project that downloads and unzips the C++ SDK.
-evaluationDependsOn(':Common/gpg-sdk')
-
-// As the plugin has created the build tasks, add the gpg-sdk task to
-// the task dependencies so it gets done before compiling
-tasks.whenTaskAdded { task ->
-    project(':Common/gpg-sdk').defaultTasks.each {
-        t ->task.dependsOn project(':Common/gpg-sdk').tasks[t]
-
-    }
-}
-
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.2'
+    compileSdkVersion 26
     defaultConfig {
             //
             //  REPLACE THE APPLICATION ID with your bundle ID
             //
         applicationId "com.google.example.games.ReplaceMe"
         minSdkVersion 14
-        targetSdkVersion  23
+        targetSdkVersion 26
+
+        ndk.abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
+
+        externalNativeBuild {
+            cmake {
+                cppFlags "-std=c++11 -Wall -frtti"
+                arguments "-DJUI_HELPER_PATH=${project(':Common:JuiHelper').projectDir}" ,
+                        "-DNDK_HELPER_PATH=${project(':Common:NDKHelper').projectDir}" ,
+                        "-DGPG_SDK_PATH=${project(':Common:gpg-sdk').projectDir}/gpg-cpp-sdk/android",
+                        "-DJSON_PATH=${project(':Common:gpg-sdk').projectDir}/../external/jsoncpp/",
+                        "-DTEAPOT_RENDERER_PATH=${project(':Common').projectDir}/TeapotRenderer" ,
+                        "-DANDROID_STL=c++_static"
+            }
 
-        ndk {
-            abiFilters 'x86', 'armeabi-v7a'
         }
     }
 
     externalNativeBuild {
-        ndkBuild {
-            path 'src/main/jni/Android.mk'
-    }
+        cmake.path "CMakeLists.txt"
     }
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services-games:10.0.0'
-    compile 'com.google.android.gms:play-services-nearby:10.0.0'
-    compile 'com.android.support:support-v4:23.1.1'
+    implementation project(":Common:JuiHelper")
+    implementation 'com.google.android.gms:play-services-games:11.6.2'
+    implementation 'com.google.android.gms:play-services-nearby:11.6.2'
+    implementation 'com.android.support:support-v4:26.1.0'
 }
@@ -20,5 +20,6 @@
 
 public class TBMPSkeletonApplication extends Application {
     public void onCreate() {
+        super.onCreate();
     }
 }
@@ -26,7 +26,7 @@
 public class TBMPSkeletonNativeActivity extends NativeActivity {
     // Load SO
     static {
-        System.load("libTBMPSkeletonNativeActivity.so");
+        System.loadLibrary("TBMPSkeletonNativeActivity");
     }
 
     @Override
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,6 @@`
`20`	`20`
`21`	`21`	`public class TBMPSkeletonApplication extends Application {`
`22`	`22`	`public void onCreate() {`
	`23`	`+ super.onCreate();`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`public class TBMPSkeletonNativeActivity extends NativeActivity {`
`27`	`27`	`// Load SO`
`28`	`28`	`static {`
`29`		`- System.load("libTBMPSkeletonNativeActivity.so");`
	`29`	`+ System.loadLibrary("TBMPSkeletonNativeActivity");`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`