From fdc6f94b54a6e3e51d2bc7b19667390c574fbe13 Mon Sep 17 00:00:00 2001
From: dream93 <dream_chou93@163.com>
Date: Thu, 9 Jan 2025 20:49:04 +0800
Subject: [PATCH] =?UTF-8?q?Android=E6=A8=A1=E6=9D=BF=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E5=AE=98=E6=96=B9=E9=BB=98=E8=AE=A4=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/android/template/app/build.gradle                | 7 +++----
 .../template/app/{ => src/main}/AndroidManifest.xml        | 0
 .../src/{ => main/java}/com/cocos/game/AppActivity.java    | 0
 templates/android/template/instantapp/build.gradle         | 7 +++----
 .../template/instantapp/{ => src/main}/AndroidManifest.xml | 0
 .../{ => main/java}/com/cocos/game/InstantActivity.java    | 0
 6 files changed, 6 insertions(+), 8 deletions(-)
 rename templates/android/template/app/{ => src/main}/AndroidManifest.xml (100%)
 rename templates/android/template/app/src/{ => main/java}/com/cocos/game/AppActivity.java (100%)
 rename templates/android/template/instantapp/{ => src/main}/AndroidManifest.xml (100%)
 rename templates/android/template/instantapp/src/{ => main/java}/com/cocos/game/InstantActivity.java (100%)

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