diff --git a/templates/android/template/app/src/main/AndroidManifest.xml b/templates/android/template/app/AndroidManifest.xml similarity index 100% rename from templates/android/template/app/src/main/AndroidManifest.xml rename to templates/android/template/app/AndroidManifest.xml diff --git a/templates/android/template/app/build.gradle b/templates/android/template/app/build.gradle index 1a3ded3cd21..184a68947f0 100644 --- a/templates/android/template/app/build.gradle +++ b/templates/android/template/app/build.gradle @@ -34,10 +34,11 @@ android { } sourceSets.main { - java.srcDirs "../src", "src/main/java" - res.srcDirs "../res", 'res', 'src/main/res', "${RES_PATH}/proj/res" + java.srcDirs "../src", "src" + res.srcDirs "../res", 'res', "${RES_PATH}/proj/res" jniLibs.srcDirs "../libs", 'libs' - assets.srcDirs "${RES_PATH}/data", 'src/main/assets' + manifest.srcFile "AndroidManifest.xml" + assets.srcDir "${RES_PATH}/data" jniLibs { // Vulkan validation layer // srcDir "${android.ndkDirectory}/sources/third_party/vulkan/src/build-android/jniLibs" diff --git a/templates/android/template/app/src/main/java/com/cocos/game/AppActivity.java b/templates/android/template/app/src/com/cocos/game/AppActivity.java similarity index 100% rename from templates/android/template/app/src/main/java/com/cocos/game/AppActivity.java rename to templates/android/template/app/src/com/cocos/game/AppActivity.java diff --git a/templates/android/template/instantapp/src/main/AndroidManifest.xml b/templates/android/template/instantapp/AndroidManifest.xml similarity index 100% rename from templates/android/template/instantapp/src/main/AndroidManifest.xml rename to templates/android/template/instantapp/AndroidManifest.xml diff --git a/templates/android/template/instantapp/build.gradle b/templates/android/template/instantapp/build.gradle index 728733cf51c..4336667f2c4 100644 --- a/templates/android/template/instantapp/build.gradle +++ b/templates/android/template/instantapp/build.gradle @@ -34,10 +34,11 @@ android { } sourceSets.main { - java.srcDirs "../src", "src/main/java" - res.srcDirs "../res", 'res', 'src/main/res', "${RES_PATH}/proj/res" + java.srcDirs "../src", "src" + res.srcDirs "../res", 'res', "${RES_PATH}/proj/res" jniLibs.srcDirs "../libs", 'libs' - assets.srcDirs "${RES_PATH}/data", 'src/main/assets' + manifest.srcFile "AndroidManifest.xml" + assets.srcDir "${RES_PATH}/data" } externalNativeBuild { diff --git a/templates/android/template/instantapp/src/main/java/com/cocos/game/InstantActivity.java b/templates/android/template/instantapp/src/com/cocos/game/InstantActivity.java similarity index 100% rename from templates/android/template/instantapp/src/main/java/com/cocos/game/InstantActivity.java rename to templates/android/template/instantapp/src/com/cocos/game/InstantActivity.java