Remove included game activity files in sample

Now that the samples are linked with static libraries, the inclusion of
game activity source files is unnecessary.

Bug: 256084775
Test: Build game_controller sample
Change-Id: I2b2ecbe17bb968fdee6ad8796cb4da7bb708c61a

5 files changed, 2 insertions, 61 deletions

diff --git a/samples/game_controller/gameactivity/app/src/main/cpp/CMakeLists.for-samples-in-archive.txt b/samples/game_controller/gameactivity/app/src/main/cpp/CMakeLists.for-samples-in-archive.txt
index e4824fad..261878ef 100644
--- a/samples/game_controller/gameactivity/app/src/main/cpp/CMakeLists.for-samples-in-archive.txt
+++ b/samples/game_controller/gameactivity/app/src/main/cpp/CMakeLists.for-samples-in-archive.txt
@@ -57,12 +57,9 @@ add_library(${CMAKE_PROJECT_NAME} SHARED
         ${COMMON_SRC_DIR}/controllerui_data.cpp
         ${COMMON_SRC_DIR}/controllerui_util.cpp
         ${COMMON_SRC_DIR}/demo_scene.cpp
-        game_activity_included.cpp
-        game_input_included.cpp
         ${COMMON_SRC_DIR}/imgui_manager.cpp
         ${COMMON_SRC_DIR}/input_util.cpp
         jni_util.cpp
-        native_app_glue_included.cpp
         native_engine.cpp
         ${COMMON_SRC_DIR}/scene.cpp
         ${COMMON_SRC_DIR}/scene_manager.cpp
@@ -89,7 +86,7 @@ target_compile_options(${CMAKE_PROJECT_NAME}
 target_link_libraries(${CMAKE_PROJECT_NAME}
         android
         imgui
-        game-activity::game-activity
+        game-activity::game-activity_static
         games-controller::paddleboat_static
         png16::png16-static
         atomic
diff --git a/samples/game_controller/gameactivity/app/src/main/cpp/CMakeLists.txt b/samples/game_controller/gameactivity/app/src/main/cpp/CMakeLists.txt
index 80a874d8..8baeed22 100644
--- a/samples/game_controller/gameactivity/app/src/main/cpp/CMakeLists.txt
+++ b/samples/game_controller/gameactivity/app/src/main/cpp/CMakeLists.txt
@@ -57,12 +57,9 @@ add_library(${CMAKE_PROJECT_NAME} SHARED
         ${COMMON_SRC_DIR}/controllerui_data.cpp
         ${COMMON_SRC_DIR}/controllerui_util.cpp
         ${COMMON_SRC_DIR}/demo_scene.cpp
-        game_activity_included.cpp
-        game_input_included.cpp
         ${COMMON_SRC_DIR}/imgui_manager.cpp
         ${COMMON_SRC_DIR}/input_util.cpp
         jni_util.cpp
-        native_app_glue_included.cpp
         native_engine.cpp
         ${COMMON_SRC_DIR}/scene.cpp
         ${COMMON_SRC_DIR}/scene_manager.cpp
@@ -89,7 +86,7 @@ target_compile_options(${CMAKE_PROJECT_NAME}
 target_link_libraries(${CMAKE_PROJECT_NAME}
         android
         imgui
-        game-activity::game-activity
+        game-activity::game-activity_static
         games-controller::paddleboat_static
         png16::png16-static
         atomic
diff --git a/samples/game_controller/gameactivity/app/src/main/cpp/game_activity_included.cpp b/samples/game_controller/gameactivity/app/src/main/cpp/game_activity_included.cpp
deleted file mode 100644
index 5cf0bd98..00000000
--- a/samples/game_controller/gameactivity/app/src/main/cpp/game_activity_included.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * 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
- *
- *     https://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.
- */
-
-// Include the GameActivity implementation
-#include "game-activity/GameActivity.cpp"
diff --git a/samples/game_controller/gameactivity/app/src/main/cpp/game_input_included.cpp b/samples/game_controller/gameactivity/app/src/main/cpp/game_input_included.cpp
deleted file mode 100644
index e3629c37..00000000
--- a/samples/game_controller/gameactivity/app/src/main/cpp/game_input_included.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * 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
- *
- *     https://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.
- */
-
-#include "game-text-input/gametextinput.cpp"
diff --git a/samples/game_controller/gameactivity/app/src/main/cpp/native_app_glue_included.cpp b/samples/game_controller/gameactivity/app/src/main/cpp/native_app_glue_included.cpp
deleted file mode 100644
index 6aa43cb9..00000000
--- a/samples/game_controller/gameactivity/app/src/main/cpp/native_app_glue_included.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * 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
- *
- *     https://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.
- */
-
-// Include the GameActivity implementation
-#include "game-activity/native_app_glue/android_native_app_glue.c"