From 728ac8d3343f98266be45776e5d264ad881d8899 Mon Sep 17 00:00:00 2001 From: Clayton Wilkinson Date: Thu, 11 Jan 2018 12:17:53 -0800 Subject: [PATCH] Moving src/main/jni to src/main/cpp to be consistent Android Studio practices. Change-Id: I0919673cb2ac1cc85093e02432a029a0cede3f02 --- samples-android/ButtonClicker/CMakeLists.txt | 4 ++-- .../src/main/{jni => cpp}/ButtonClickerNativeActivity.cpp | 0 .../src/main/{jni => cpp}/ButtonClickerNativeActivity.h | 0 .../main/{jni => cpp}/ButtonClickerNativeActivity_Engine.cpp | 0 samples-android/CollectAllTheStarsNative/CMakeLists.txt | 4 ++-- .../main/{jni => cpp}/CollectAllTheStarsNativeActivity.cpp | 0 .../src/main/{jni => cpp}/CollectAllTheStarsNativeActivity.h | 0 .../{jni => cpp}/CollectAllTheStarsNativeActivity_Engine.cpp | 0 samples-android/Minimalist/CMakeLists.txt | 4 ++-- .../Minimalist/src/main/{jni => cpp}/StateManager.cpp | 0 .../Minimalist/src/main/{jni => cpp}/StateManager.h | 0 samples-android/Minimalist/src/main/{jni => cpp}/main.cpp | 0 samples-android/TbmpSkeletonNative/CMakeLists.txt | 4 ++-- .../src/main/{jni => cpp}/TBMPSkeletonNativeActivity.cpp | 0 .../src/main/{jni => cpp}/TBMPSkeletonNativeActivity.h | 0 .../main/{jni => cpp}/TBMPSkeletonNativeActivity_Engine.cpp | 0 samples-android/Teapot/CMakeLists.txt | 4 ++-- .../Teapot/src/main/{jni => cpp}/NativeGameActivity.cpp | 0 samples-android/Teapot/src/main/{jni => cpp}/StateManager.cpp | 0 samples-android/Teapot/src/main/{jni => cpp}/StateManager.h | 0 20 files changed, 10 insertions(+), 10 deletions(-) rename samples-android/ButtonClicker/src/main/{jni => cpp}/ButtonClickerNativeActivity.cpp (100%) rename samples-android/ButtonClicker/src/main/{jni => cpp}/ButtonClickerNativeActivity.h (100%) rename samples-android/ButtonClicker/src/main/{jni => cpp}/ButtonClickerNativeActivity_Engine.cpp (100%) rename samples-android/CollectAllTheStarsNative/src/main/{jni => cpp}/CollectAllTheStarsNativeActivity.cpp (100%) rename samples-android/CollectAllTheStarsNative/src/main/{jni => cpp}/CollectAllTheStarsNativeActivity.h (100%) rename samples-android/CollectAllTheStarsNative/src/main/{jni => cpp}/CollectAllTheStarsNativeActivity_Engine.cpp (100%) rename samples-android/Minimalist/src/main/{jni => cpp}/StateManager.cpp (100%) rename samples-android/Minimalist/src/main/{jni => cpp}/StateManager.h (100%) rename samples-android/Minimalist/src/main/{jni => cpp}/main.cpp (100%) rename samples-android/TbmpSkeletonNative/src/main/{jni => cpp}/TBMPSkeletonNativeActivity.cpp (100%) rename samples-android/TbmpSkeletonNative/src/main/{jni => cpp}/TBMPSkeletonNativeActivity.h (100%) rename samples-android/TbmpSkeletonNative/src/main/{jni => cpp}/TBMPSkeletonNativeActivity_Engine.cpp (100%) rename samples-android/Teapot/src/main/{jni => cpp}/NativeGameActivity.cpp (100%) rename samples-android/Teapot/src/main/{jni => cpp}/StateManager.cpp (100%) rename samples-android/Teapot/src/main/{jni => cpp}/StateManager.h (100%) diff --git a/samples-android/ButtonClicker/CMakeLists.txt b/samples-android/ButtonClicker/CMakeLists.txt index c471aa9..1b66741 100644 --- a/samples-android/ButtonClicker/CMakeLists.txt +++ b/samples-android/ButtonClicker/CMakeLists.txt @@ -57,8 +57,8 @@ add_library( # Sets the name of the library. SHARED # Provides a relative path to your source file(s). - src/main/jni/ButtonClickerNativeActivity.cpp - src/main/jni/ButtonClickerNativeActivity_Engine.cpp + src/main/cpp/ButtonClickerNativeActivity.cpp + src/main/cpp/ButtonClickerNativeActivity_Engine.cpp ${TEAPOT_RENDERER_PATH}/TeapotRenderer.cpp ) diff --git a/samples-android/ButtonClicker/src/main/jni/ButtonClickerNativeActivity.cpp b/samples-android/ButtonClicker/src/main/cpp/ButtonClickerNativeActivity.cpp similarity index 100% rename from samples-android/ButtonClicker/src/main/jni/ButtonClickerNativeActivity.cpp rename to samples-android/ButtonClicker/src/main/cpp/ButtonClickerNativeActivity.cpp diff --git a/samples-android/ButtonClicker/src/main/jni/ButtonClickerNativeActivity.h b/samples-android/ButtonClicker/src/main/cpp/ButtonClickerNativeActivity.h similarity index 100% rename from samples-android/ButtonClicker/src/main/jni/ButtonClickerNativeActivity.h rename to samples-android/ButtonClicker/src/main/cpp/ButtonClickerNativeActivity.h diff --git a/samples-android/ButtonClicker/src/main/jni/ButtonClickerNativeActivity_Engine.cpp b/samples-android/ButtonClicker/src/main/cpp/ButtonClickerNativeActivity_Engine.cpp similarity index 100% rename from samples-android/ButtonClicker/src/main/jni/ButtonClickerNativeActivity_Engine.cpp rename to samples-android/ButtonClicker/src/main/cpp/ButtonClickerNativeActivity_Engine.cpp diff --git a/samples-android/CollectAllTheStarsNative/CMakeLists.txt b/samples-android/CollectAllTheStarsNative/CMakeLists.txt index 06c8a66..7846009 100644 --- a/samples-android/CollectAllTheStarsNative/CMakeLists.txt +++ b/samples-android/CollectAllTheStarsNative/CMakeLists.txt @@ -63,8 +63,8 @@ add_library( # Sets the name of the library. # Sets the library as a shared library. SHARED # Provides a relative path to your source file(s). - src/main/jni/CollectAllTheStarsNativeActivity.cpp - src/main/jni/CollectAllTheStarsNativeActivity_Engine.cpp + src/main/cpp/CollectAllTheStarsNativeActivity.cpp + src/main/cpp/CollectAllTheStarsNativeActivity_Engine.cpp ${TEAPOT_RENDERER_PATH}/TeapotRenderer.cpp ) diff --git a/samples-android/CollectAllTheStarsNative/src/main/jni/CollectAllTheStarsNativeActivity.cpp b/samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity.cpp similarity index 100% rename from samples-android/CollectAllTheStarsNative/src/main/jni/CollectAllTheStarsNativeActivity.cpp rename to samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity.cpp diff --git a/samples-android/CollectAllTheStarsNative/src/main/jni/CollectAllTheStarsNativeActivity.h b/samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity.h similarity index 100% rename from samples-android/CollectAllTheStarsNative/src/main/jni/CollectAllTheStarsNativeActivity.h rename to samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity.h diff --git a/samples-android/CollectAllTheStarsNative/src/main/jni/CollectAllTheStarsNativeActivity_Engine.cpp b/samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity_Engine.cpp similarity index 100% rename from samples-android/CollectAllTheStarsNative/src/main/jni/CollectAllTheStarsNativeActivity_Engine.cpp rename to samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity_Engine.cpp diff --git a/samples-android/Minimalist/CMakeLists.txt b/samples-android/Minimalist/CMakeLists.txt index 4173286..051fc84 100644 --- a/samples-android/Minimalist/CMakeLists.txt +++ b/samples-android/Minimalist/CMakeLists.txt @@ -29,8 +29,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o add_library(native-activity SHARED - src/main/jni/main.cpp - src/main/jni/StateManager.cpp + src/main/cpp/main.cpp + src/main/cpp/StateManager.cpp ) target_include_directories(native-activity PRIVATE diff --git a/samples-android/Minimalist/src/main/jni/StateManager.cpp b/samples-android/Minimalist/src/main/cpp/StateManager.cpp similarity index 100% rename from samples-android/Minimalist/src/main/jni/StateManager.cpp rename to samples-android/Minimalist/src/main/cpp/StateManager.cpp diff --git a/samples-android/Minimalist/src/main/jni/StateManager.h b/samples-android/Minimalist/src/main/cpp/StateManager.h similarity index 100% rename from samples-android/Minimalist/src/main/jni/StateManager.h rename to samples-android/Minimalist/src/main/cpp/StateManager.h diff --git a/samples-android/Minimalist/src/main/jni/main.cpp b/samples-android/Minimalist/src/main/cpp/main.cpp similarity index 100% rename from samples-android/Minimalist/src/main/jni/main.cpp rename to samples-android/Minimalist/src/main/cpp/main.cpp diff --git a/samples-android/TbmpSkeletonNative/CMakeLists.txt b/samples-android/TbmpSkeletonNative/CMakeLists.txt index f0a2dee..8d2a0ca 100644 --- a/samples-android/TbmpSkeletonNative/CMakeLists.txt +++ b/samples-android/TbmpSkeletonNative/CMakeLists.txt @@ -51,8 +51,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o add_library(TBMPSkeletonNativeActivity SHARED - src/main/jni/TBMPSkeletonNativeActivity.cpp - src/main/jni/TBMPSkeletonNativeActivity_Engine.cpp + src/main/cpp/TBMPSkeletonNativeActivity.cpp + src/main/cpp/TBMPSkeletonNativeActivity_Engine.cpp ${TEAPOT_RENDERER_PATH}/TeapotRenderer.cpp ) diff --git a/samples-android/TbmpSkeletonNative/src/main/jni/TBMPSkeletonNativeActivity.cpp b/samples-android/TbmpSkeletonNative/src/main/cpp/TBMPSkeletonNativeActivity.cpp similarity index 100% rename from samples-android/TbmpSkeletonNative/src/main/jni/TBMPSkeletonNativeActivity.cpp rename to samples-android/TbmpSkeletonNative/src/main/cpp/TBMPSkeletonNativeActivity.cpp diff --git a/samples-android/TbmpSkeletonNative/src/main/jni/TBMPSkeletonNativeActivity.h b/samples-android/TbmpSkeletonNative/src/main/cpp/TBMPSkeletonNativeActivity.h similarity index 100% rename from samples-android/TbmpSkeletonNative/src/main/jni/TBMPSkeletonNativeActivity.h rename to samples-android/TbmpSkeletonNative/src/main/cpp/TBMPSkeletonNativeActivity.h diff --git a/samples-android/TbmpSkeletonNative/src/main/jni/TBMPSkeletonNativeActivity_Engine.cpp b/samples-android/TbmpSkeletonNative/src/main/cpp/TBMPSkeletonNativeActivity_Engine.cpp similarity index 100% rename from samples-android/TbmpSkeletonNative/src/main/jni/TBMPSkeletonNativeActivity_Engine.cpp rename to samples-android/TbmpSkeletonNative/src/main/cpp/TBMPSkeletonNativeActivity_Engine.cpp diff --git a/samples-android/Teapot/CMakeLists.txt b/samples-android/Teapot/CMakeLists.txt index 17dc44c..04720db 100644 --- a/samples-android/Teapot/CMakeLists.txt +++ b/samples-android/Teapot/CMakeLists.txt @@ -39,8 +39,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o add_library(teapot SHARED - src/main/jni/NativeGameActivity.cpp - src/main/jni/StateManager.cpp + src/main/cpp/NativeGameActivity.cpp + src/main/cpp/StateManager.cpp ${TEAPOT_RENDERER_PATH}/TeapotRenderer.cpp ) diff --git a/samples-android/Teapot/src/main/jni/NativeGameActivity.cpp b/samples-android/Teapot/src/main/cpp/NativeGameActivity.cpp similarity index 100% rename from samples-android/Teapot/src/main/jni/NativeGameActivity.cpp rename to samples-android/Teapot/src/main/cpp/NativeGameActivity.cpp diff --git a/samples-android/Teapot/src/main/jni/StateManager.cpp b/samples-android/Teapot/src/main/cpp/StateManager.cpp similarity index 100% rename from samples-android/Teapot/src/main/jni/StateManager.cpp rename to samples-android/Teapot/src/main/cpp/StateManager.cpp diff --git a/samples-android/Teapot/src/main/jni/StateManager.h b/samples-android/Teapot/src/main/cpp/StateManager.h similarity index 100% rename from samples-android/Teapot/src/main/jni/StateManager.h rename to samples-android/Teapot/src/main/cpp/StateManager.h