Moving src/main/jni to src/main/cpp to be consistent Android Studio

practices. Change-Id: I0919673cb2ac1cc85093e02432a029a0cede3f02
playgameservices · Jan 11, 2018 · 728ac8d · 728ac8d
1 parent f6bf9e6
commit 728ac8d
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 10 deletions.
diff --git 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/.../main/jni/ButtonClickerNativeActivity.cpp → .../main/cpp/ButtonClickerNativeActivity.cpp b/.../main/jni/ButtonClickerNativeActivity.cpp → .../main/cpp/ButtonClickerNativeActivity.cpp
diff --git a/...rc/main/jni/ButtonClickerNativeActivity.h → ...rc/main/cpp/ButtonClickerNativeActivity.h b/...rc/main/jni/ButtonClickerNativeActivity.h → ...rc/main/cpp/ButtonClickerNativeActivity.h
diff --git a/...ni/ButtonClickerNativeActivity_Engine.cpp → ...pp/ButtonClickerNativeActivity_Engine.cpp b/...ni/ButtonClickerNativeActivity_Engine.cpp → ...pp/ButtonClickerNativeActivity_Engine.cpp
diff --git 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/.../jni/CollectAllTheStarsNativeActivity.cpp → .../cpp/CollectAllTheStarsNativeActivity.cpp b/.../jni/CollectAllTheStarsNativeActivity.cpp → .../cpp/CollectAllTheStarsNativeActivity.cpp
diff --git a/...in/jni/CollectAllTheStarsNativeActivity.h → ...in/cpp/CollectAllTheStarsNativeActivity.h b/...in/jni/CollectAllTheStarsNativeActivity.h → ...in/cpp/CollectAllTheStarsNativeActivity.h
diff --git a/...llectAllTheStarsNativeActivity_Engine.cpp → ...llectAllTheStarsNativeActivity_Engine.cpp b/...llectAllTheStarsNativeActivity_Engine.cpp → ...llectAllTheStarsNativeActivity_Engine.cpp
diff --git 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/.../Minimalist/src/main/jni/StateManager.cpp → .../Minimalist/src/main/cpp/StateManager.cpp b/.../Minimalist/src/main/jni/StateManager.cpp → .../Minimalist/src/main/cpp/StateManager.cpp
diff --git a/...id/Minimalist/src/main/jni/StateManager.h → ...id/Minimalist/src/main/cpp/StateManager.h b/...id/Minimalist/src/main/jni/StateManager.h → ...id/Minimalist/src/main/cpp/StateManager.h
diff --git a/...-android/Minimalist/src/main/jni/main.cpp → ...-android/Minimalist/src/main/cpp/main.cpp b/...-android/Minimalist/src/main/jni/main.cpp → ...-android/Minimalist/src/main/cpp/main.cpp
diff --git 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/...c/main/jni/TBMPSkeletonNativeActivity.cpp → ...c/main/cpp/TBMPSkeletonNativeActivity.cpp b/...c/main/jni/TBMPSkeletonNativeActivity.cpp → ...c/main/cpp/TBMPSkeletonNativeActivity.cpp
diff --git a/...src/main/jni/TBMPSkeletonNativeActivity.h → ...src/main/cpp/TBMPSkeletonNativeActivity.h b/...src/main/jni/TBMPSkeletonNativeActivity.h → ...src/main/cpp/TBMPSkeletonNativeActivity.h
diff --git a/...jni/TBMPSkeletonNativeActivity_Engine.cpp → ...cpp/TBMPSkeletonNativeActivity_Engine.cpp b/...jni/TBMPSkeletonNativeActivity_Engine.cpp → ...cpp/TBMPSkeletonNativeActivity_Engine.cpp
diff --git 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/...eapot/src/main/jni/NativeGameActivity.cpp → ...eapot/src/main/cpp/NativeGameActivity.cpp b/...eapot/src/main/jni/NativeGameActivity.cpp → ...eapot/src/main/cpp/NativeGameActivity.cpp
diff --git a/...roid/Teapot/src/main/jni/StateManager.cpp → ...roid/Teapot/src/main/cpp/StateManager.cpp b/...roid/Teapot/src/main/jni/StateManager.cpp → ...roid/Teapot/src/main/cpp/StateManager.cpp
diff --git a/...ndroid/Teapot/src/main/jni/StateManager.h → ...ndroid/Teapot/src/main/cpp/StateManager.h b/...ndroid/Teapot/src/main/jni/StateManager.h → ...ndroid/Teapot/src/main/cpp/StateManager.h