Skip to content

Fix APK not have assets folder #19679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from May 14, 2019
Merged

Fix APK not have assets folder #19679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4ec474
Fix APK not have assets folder
turgenevivan May 8, 2019
f6c464f
Android project: copy all res to assets folder
turgenevivan May 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions templates/cpp-template-default/proj.android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ android {
java.srcDir "src"
res.srcDir "res"
manifest.srcFile "AndroidManifest.xml"
assets.srcDir "../../Resources"
assets.srcDir "assets"
}

externalNativeBuild {
Expand Down Expand Up @@ -111,13 +111,16 @@ android {
}

android.applicationVariants.all { variant ->
def project_root_folder = "${buildDir}/../../.."
def dest_assets_folder = "${buildDir}/../assets"

// delete previous files first
delete "${buildDir}/intermediates/assets/${variant.dirName}"
delete dest_assets_folder

variant.mergeAssets.doLast {
variant.mergeAssets.doFirst {
copy {
from "${buildDir}/../../../Resources"
into "${buildDir}/intermediates/assets/${variant.dirName}"
from project_root_folder + "/Resources"
into dest_assets_folder
exclude "**/*.gz"
}
}
Expand Down
29 changes: 16 additions & 13 deletions templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ android {
res.srcDir "res"
jniLibs.srcDir "libs"
manifest.srcFile "AndroidManifest.xml"
assets.srcDir "assets"
}

externalNativeBuild {
Expand Down Expand Up @@ -145,29 +146,32 @@ def compileJS(srcDir, dstDir) {
}

android.applicationVariants.all { variant ->
def project_root_folder = "${buildDir}/../../../../.."
def dest_assets_folder = "${buildDir}/../assets"

// delete previous files first
delete "${buildDir}/intermediates/assets/${variant.dirName}"
delete dest_assets_folder

variant.mergeAssets.doLast {
variant.mergeAssets.doFirst {
copy {
from "${buildDir}/../../../../../res"
into "${buildDir}/intermediates/assets/${variant.dirName}/res"
from project_root_folder + "/res"
into dest_assets_folder + "/res"
}

copy {
from "${buildDir}/../../../../../src"
into "${buildDir}/intermediates/assets/${variant.dirName}/src"
from project_root_folder + "/src"
into dest_assets_folder + "/src"
}

copy {
from "${buildDir}/../../../../cocos2d-x/cocos/scripting/js-bindings/script"
into "${buildDir}/intermediates/assets/${variant.dirName}/script"
from project_root_folder + "/frameworks/cocos2d-x/cocos/scripting/js-bindings/script"
into dest_assets_folder + "/script"
}

copy {
from "${buildDir}/../../../../../main.js"
from "${buildDir}/../../../../../project.json"
into "${buildDir}/intermediates/assets/${variant.dirName}"
from project_root_folder + "/main.js"
from project_root_folder + "/project.json"
into dest_assets_folder
}

// compile the scripts if necessary
Expand All @@ -177,8 +181,7 @@ android.applicationVariants.all { variant ->
}

if (compileScript) {
compileJS("${buildDir}/intermediates/assets/${variant.dirName}",
"${buildDir}/intermediates/assets/${variant.dirName}")
compileJS(dest_assets_folder, dest_assets_folder)
}
}
}
Expand Down
42 changes: 23 additions & 19 deletions templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ android {
res.srcDir "res"
jniLibs.srcDir "libs"
manifest.srcFile "AndroidManifest.xml"
assets.srcDir "assets"
}

externalNativeBuild {
Expand Down Expand Up @@ -160,23 +161,26 @@ def compileLua(srcDir, dstDir, doCompile, is64bit, doEncrypt) {
}

android.applicationVariants.all { variant ->
def project_root_folder = "${buildDir}/../../../../.."
def dest_assets_folder = "${buildDir}/../assets"

// delete previous files first
delete "${buildDir}/intermediates/assets/${variant.dirName}"
delete dest_assets_folder

variant.mergeAssets.doLast {
variant.mergeAssets.doFirst {
copy {
from "${buildDir}/../../../../../res"
into "${buildDir}/intermediates/assets/${variant.dirName}/res"
from project_root_folder + "/res"
into dest_assets_folder + "/res"
}

copy {
from "${buildDir}/../../../../../src"
into "${buildDir}/intermediates/assets/${variant.dirName}/src"
from project_root_folder + "/src"
into dest_assets_folder + "/src"
}

// copy {
// from "${buildDir}/../../../../cocos2d-x/cocos/scripting/lua-bindings/script"
// into "${buildDir}/intermediates/assets/${variant.dirName}/src/cocos"
// into dest_assets_folder + "/src/cocos"
// }

// compile & encrypt the scripts if necessary
Expand Down Expand Up @@ -220,32 +224,32 @@ android.applicationVariants.all { variant ->
// invoke cocos command to compile & encrypt the lua files
switch (buildType) {
case -1:
compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
"${buildDir}/intermediates/assets/${variant.dirName}/src",
compileLua(dest_assets_folder + "/src",
dest_assets_folder + "/src",
false, false, encryptLua)
break
case 0:
compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
"${buildDir}/intermediates/assets/${variant.dirName}/src",
compileLua(dest_assets_folder + "/src",
dest_assets_folder + "/src",
true, false, encryptLua)
break
case 1:
compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
"${buildDir}/intermediates/assets/${variant.dirName}/src/64bit",
compileLua(dest_assets_folder + "/src",
dest_assets_folder + "/src/64bit",
true, true, encryptLua)

// remove the lua files in src dir
delete fileTree("${buildDir}/intermediates/assets/${variant.dirName}/src") {
delete fileTree(dest_assets_folder + "/src") {
include '**/*.lua'
}
delete "${buildDir}/intermediates/assets/${variant.dirName}/src/cocos"
delete dest_assets_folder + "/src/cocos"
break
case 2:
compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
"${buildDir}/intermediates/assets/${variant.dirName}/src/64bit",
compileLua(dest_assets_folder + "/src",
dest_assets_folder + "/src/64bit",
true, true, encryptLua)
compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
"${buildDir}/intermediates/assets/${variant.dirName}/src",
compileLua(dest_assets_folder + "/src",
dest_assets_folder + "/src",
true, false, encryptLua)
break
}
Expand Down