Skip to content

Commit

Permalink
Actually renamed Android module
Browse files Browse the repository at this point in the history
  • Loading branch information
jarrodnorwell committed Apr 11, 2024
1 parent 13e79aa commit edd7896
Show file tree
Hide file tree
Showing 433 changed files with 10 additions and 23,859 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -94,8 +94,8 @@ if (ANDROID AND SUDACHI_DOWNLOAD_ANDROID_VVL)
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
endif()

# Copy the arm64 binary to src/android/app/main/jniLibs
set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/arm64-v8a/")
# Copy the arm64 binary to src/android/sudachi/main/jniLibs
set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/sudachi/src/main/jniLibs/arm64-v8a/")
file(COPY "${CMAKE_BINARY_DIR}/externals/android-binaries-${vvl_version}/arm64-v8a/libVkLayer_khronos_validation.so"
DESTINATION "${vvl_lib_path}")
endif()
Expand Down
4 changes: 2 additions & 2 deletions dist/languages/.tx/config
Expand Up @@ -8,7 +8,7 @@ source_lang = en
type = QT

[o:sudachi-emulator:p:sudachi:r:sudachi-android]
file_filter = ../../src/android/app/src/main/res/values-<lang>/strings.xml
source_file = ../../src/android/app/src/main/res/values/strings.xml
file_filter = ../../src/android/sudachi/src/main/res/values-<lang>/strings.xml
source_file = ../../src/android/sudachi/src/main/res/values/strings.xml
type = ANDROID
lang_map = ja_JP:ja, ko_KR:ko, pt_BR:pt-rBR, pt_PT:pt-rPT, ru_RU:ru, vi_VN:vi, zh_CN:zh-rCN, zh_TW:zh-rTW
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Expand Up @@ -214,6 +214,6 @@ if (ENABLE_WEB_SERVICE)
endif()

if (ANDROID)
add_subdirectory(android/app/src/main/jni)
target_include_directories(sudachi-android PRIVATE android/app/src/main)
add_subdirectory(android/sudachi/src/main/jni)
target_include_directories(sudachi-android PRIVATE android/sudachi/src/main)
endif()
6 changes: 3 additions & 3 deletions src/android/.gitignore
Expand Up @@ -47,7 +47,7 @@ captures/
.externalNativeBuild

# CXX compile cache
app/.cxx
sudachi/.cxx

# Google Services (e.g. APIs or Firebase)
google-services.json
Expand All @@ -67,5 +67,5 @@ fastlane/readme.md
# Autogenerated library for vulkan validation layers
libVkLayer_khronos_validation.so

app/ea
app/mainline
sudachi/ea
sudachi/mainline
24 changes: 0 additions & 24 deletions src/android/app/proguard-rules.pro

This file was deleted.

22 changes: 0 additions & 22 deletions src/android/app/src/ea/res/drawable/ic_sudachi.xml

This file was deleted.

12 changes: 0 additions & 12 deletions src/android/app/src/ea/res/drawable/ic_sudachi_full.xml

This file was deleted.

24 changes: 0 additions & 24 deletions src/android/app/src/ea/res/drawable/ic_sudachi_title.xml

This file was deleted.

95 changes: 0 additions & 95 deletions src/android/app/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

0 comments on commit edd7896

Please sign in to comment.