diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-10-29 08:34:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-29 08:34:03 +0100 |
| commit | a4f70d7e6cb2b83f152717a69c9c042dd9424fc9 (patch) | |
| tree | 5d5578b91e5d5c77c6272957a46cb6dbb819add1 /platform/android/java/lib | |
| parent | 13e93fe90499b3aac569ac09440c8d6056efba68 (diff) | |
| parent | edf762fba6b305771191b706e4d097f7b5285360 (diff) | |
Merge pull request #43178 from m4gr3d/update_android_plugins
Update android gradle plugins versions
Diffstat (limited to 'platform/android/java/lib')
| -rw-r--r-- | platform/android/java/lib/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | platform/android/java/lib/build.gradle | 20 |
2 files changed, 5 insertions, 33 deletions
diff --git a/platform/android/java/lib/CMakeLists.txt b/platform/android/java/lib/CMakeLists.txt deleted file mode 100644 index d3bdf6a5f2..0000000000 --- a/platform/android/java/lib/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.6) -project(godot) - -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) - -set(GODOT_ROOT_DIR ../../../..) - -# Get sources -file(GLOB_RECURSE SOURCES ${GODOT_ROOT_DIR}/*.c**) -file(GLOB_RECURSE HEADERS ${GODOT_ROOT_DIR}/*.h**) - -add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS}) -target_include_directories(${PROJECT_NAME} - SYSTEM PUBLIC - ${GODOT_ROOT_DIR} - ${GODOT_ROOT_DIR}/modules/gdnative/include) diff --git a/platform/android/java/lib/build.gradle b/platform/android/java/lib/build.gradle index 19eee5a315..e3c5a02203 100644 --- a/platform/android/java/lib/build.gradle +++ b/platform/android/java/lib/build.gradle @@ -18,6 +18,11 @@ android { targetSdkVersion versions.targetSdk } + compileOptions { + sourceCompatibility versions.javaVersion + targetCompatibility versions.javaVersion + } + lintOptions { abortOnError false disable 'MissingTranslation', 'UnusedResources' @@ -50,15 +55,6 @@ android { def buildType = variant.buildType.name.capitalize() - def taskPrefix = "" - if (project.path != ":") { - taskPrefix = project.path + ":" - } - - // Disable the externalNativeBuild* task as it would cause build failures since the cmake build - // files is only setup for editing support. - gradle.startParameter.excludedTaskNames += taskPrefix + "externalNativeBuild" + buildType - def releaseTarget = buildType.toLowerCase() if (releaseTarget == null || releaseTarget == "") { throw new GradleException("Invalid build type: " + buildType) @@ -78,10 +74,4 @@ android { // Schedule the tasks so the generated libs are present before the aar file is packaged. tasks["merge${buildType}JniLibFolders"].dependsOn taskName } - - externalNativeBuild { - cmake { - path "CMakeLists.txt" - } - } } |