Replaced NativeActivity with GameActivity

Author: ggfan

common/nativeactivity/build.gradle

@@ -0,0 +1,23 @@
+// Copyright 2022 Google Inc. All Rights Reserved.
+//
+// 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.
+
+// GameActivity's C/C++ code
+#include <game-activity/GameActivity.cpp>
+#include <game-text-input/gametextinput.cpp>
+
+// Glue from GameActivity to android_main()
+// Passing GameActivity event from main thread to app native thread.
+extern  "C" {
+    #include <game-activity/native_app_glue/android_native_app_glue.c>
+}

common/nativeactivity/proguard-rules.pro

@@ -1,23 +1,49 @@
+// Copyright 2022 Google Inc. All Rights Reserved.
+//
+// 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'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     ndkVersion '22.1.7171670'
 
     defaultConfig {
-        applicationId "com.google.vulkan.tutorials.one"
+        applicationId "com.android.example.vulkan.tutorials.one"
         minSdkVersion 24
-        targetSdkVersion 30
-        versionCode 1
-        versionName "0.0.1"
+        targetSdkVersion 31
+
+        versionCode  272
+        versionName "1.1.0"
         externalNativeBuild {
             cmake {
                 abiFilters "armeabi-v7a", 'arm64-v8a', 'x86', 'x86_64'
                 arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static'
             }
         }
     }
-    externalNativeBuild.cmake.path = 'src/main/jni/CMakeLists.txt'
+    externalNativeBuild {
+        cmake {
+            version '3.18.1'
+            path    'src/main/cpp/CMakeLists.txt'
+        }
+    }
 
     buildTypes.release.minifyEnabled = false
+    buildFeatures.prefab = true
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation "androidx.games:games-activity:1.1.0"
 }

common/nativeactivity/src/main/AndroidManifest.xml

@@ -1,19 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2022 Google Inc. All Rights Reserved.
+
+ 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.
+-->
 <!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.google.vulkan.tutorials.one"
-        android:versionCode="1"
-        android:versionName="1.0">
+        package="com.android.example.vulkan.tutorials.one"
+        android:versionCode="272"
+        android:versionName="1.1.0">
 
     <application android:label="@string/app_name"
-      android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+      android:theme="@style/Application.Fullscreen">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden">
 
-        <!-- Our activity is the built-in NativeActivity framework class.
-             This will take care of integrating with our NDK code. -->
-        <activity android:name="android.app.NativeActivity"
-                android:label="@string/app_name"
-                android:configChanges="orientation|keyboardHidden">
-            <!-- Tell NativeActivity the name of or .so -->
+            <!-- Tell GameActivity the name of our .so.
+                 This will be optional after the release 1.1.0 -->
             <meta-data android:name="android.app.lib_name"
                     android:value="vktuts" />
             <intent-filter>

common/src/GameActivitySources.cpp

@@ -0,0 +1,43 @@
+#[[
+Copyright 2022 Google Inc. All Rights Reserved.
+
+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.
+]]
+cmake_minimum_required(VERSION 3.4.1)
+
+project(vktuts)
+
+# Integrate GameActivity, refer to
+#     https://d.android.com/games/agdk/integrate-game-activity
+# for the detailed instructions.
+find_package(game-activity REQUIRED CONFIG)
+
+set(SRC_DIR ${CMAKE_SOURCE_DIR})
+get_filename_component(REPO_ROOT_DIR
+    ${CMAKE_SOURCE_DIR}/../../../../..  ABSOLUTE)
+set(COMMON_DIR ${REPO_ROOT_DIR}/common)
+
+add_library(${CMAKE_PROJECT_NAME} SHARED
+    main.cpp
+    ${COMMON_DIR}/vulkan_wrapper/vulkan_wrapper.cpp
+    ${COMMON_DIR}/src/GameActivitySources.cpp)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -std=c++11 \
+                     -DVK_USE_PLATFORM_ANDROID_KHR")
+
+target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE
+    ${COMMON_DIR}/vulkan_wrapper)
+target_link_libraries(${CMAKE_PROJECT_NAME}
+    game-activity::game-activity
+    log
+    android)

tutorial01_load_vulkan/app/build.gradle

@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2022 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 #include <android/log.h>
-#include <android_native_app_glue.h>
 #include <cassert>
 #include <vector>
-#include "vulkan_wrapper.h"
+#include <vulkan_wrapper.h>
+#include <game-activity/native_app_glue/android_native_app_glue.h>
 
 // Android log function wrappers
 static const char* kTAG = "Vulkan-Tutorial01";

tutorial01_load_vulkan/app/src/main/AndroidManifest.xml

@@ -0,0 +1,30 @@
+// Copyright 2022 Google Inc. All Rights Reserved.
+//
+// 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.
+
+package com.android.example.vulkan.tutorials.one;
+
+import com.google.androidgamesdk.GameActivity;
+import android.os.Bundle;
+
+public class MainActivity extends GameActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+    static {
+        System.loadLibrary("vktuts");
+    }
+}
+