Skip to content

Commit 728ac8d

Browse files
claywilkinsonclaywilkinson
committed
Moving src/main/jni to src/main/cpp to be consistent Android Studio
practices. Change-Id: I0919673cb2ac1cc85093e02432a029a0cede3f02
1 parent f6bf9e6 commit 728ac8d

20 files changed

+10
-10
lines changed

‎samples-android/ButtonClicker/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ add_library( # Sets the name of the library.
5757
SHARED
5858

5959
# Provides a relative path to your source file(s).
60-
src/main/jni/ButtonClickerNativeActivity.cpp
61-
src/main/jni/ButtonClickerNativeActivity_Engine.cpp
60+
src/main/cpp/ButtonClickerNativeActivity.cpp
61+
src/main/cpp/ButtonClickerNativeActivity_Engine.cpp
6262
${TEAPOT_RENDERER_PATH}/TeapotRenderer.cpp
6363
)
6464

samples-android/ButtonClicker/src/main/jni/ButtonClickerNativeActivity.cpp renamed to samples-android/ButtonClicker/src/main/cpp/ButtonClickerNativeActivity.cpp

File renamed without changes.

samples-android/ButtonClicker/src/main/jni/ButtonClickerNativeActivity.h renamed to samples-android/ButtonClicker/src/main/cpp/ButtonClickerNativeActivity.h

File renamed without changes.

samples-android/ButtonClicker/src/main/jni/ButtonClickerNativeActivity_Engine.cpp renamed to samples-android/ButtonClicker/src/main/cpp/ButtonClickerNativeActivity_Engine.cpp

File renamed without changes.

‎samples-android/CollectAllTheStarsNative/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ add_library( # Sets the name of the library.
6363
# Sets the library as a shared library.
6464
SHARED
6565
# Provides a relative path to your source file(s).
66-
src/main/jni/CollectAllTheStarsNativeActivity.cpp
67-
src/main/jni/CollectAllTheStarsNativeActivity_Engine.cpp
66+
src/main/cpp/CollectAllTheStarsNativeActivity.cpp
67+
src/main/cpp/CollectAllTheStarsNativeActivity_Engine.cpp
6868
${TEAPOT_RENDERER_PATH}/TeapotRenderer.cpp
6969
)
7070

samples-android/CollectAllTheStarsNative/src/main/jni/CollectAllTheStarsNativeActivity.cpp renamed to samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity.cpp

File renamed without changes.

samples-android/CollectAllTheStarsNative/src/main/jni/CollectAllTheStarsNativeActivity.h renamed to samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity.h

File renamed without changes.

samples-android/CollectAllTheStarsNative/src/main/jni/CollectAllTheStarsNativeActivity_Engine.cpp renamed to samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity_Engine.cpp

File renamed without changes.

‎samples-android/Minimalist/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2929

3030
add_library(native-activity
3131
SHARED
32-
src/main/jni/main.cpp
33-
src/main/jni/StateManager.cpp
32+
src/main/cpp/main.cpp
33+
src/main/cpp/StateManager.cpp
3434
)
3535

3636
target_include_directories(native-activity PRIVATE

samples-android/Minimalist/src/main/jni/StateManager.cpp renamed to samples-android/Minimalist/src/main/cpp/StateManager.cpp

File renamed without changes.

0 commit comments

Comments
 (0)