[3.3] some little fixes (#3626)

This commit is contained in:
江战
2021-06-18 10:49:40 +08:00
committed by GitHub
parent b2fe7ba5c9
commit 8378a4a856
7 changed files with 19 additions and 50 deletions
+9
View File
@@ -1179,6 +1179,15 @@ if(CC_USE_VULKAN)
cocos/renderer/gfx-vulkan/volk.c
cocos/renderer/gfx-vulkan/volk.h
)
if(ANDROID)
set_source_files_properties(
${CWD}/cocos/renderer/gfx-vulkan/VKDevice.cpp
PROPERTIES
# supress warning on Android
COMPILE_FLAGS -Wno-nullability-completeness
)
endif()
endif()
cocos_source_files(
@@ -25,6 +25,7 @@
#include "base/CoreStd.h"
#include <cassert>
#include "DummyJobGraph.h"
#define DUMMY_GRAPH_NODE_CHUNK_SIZE 64
@@ -48,6 +49,7 @@ void DummyGraphNode::reset() {
}
void DummyGraphNode::succeed(DummyGraphNode *other) {
assert(this != other);
// Run after other
this->_predecessors.emplace(other);
other->_successors.emplace(this);
@@ -43,10 +43,10 @@ RES_PATH=
APPLICATION_ID=
# List of CPU Archtexture to build that application with
# Available architextures (armeabi-v7a | arm64-v8a | x86)
# Available architextures (armeabi-v7a | arm64-v8a | x86 | x86_64)
# To build for multiple architexture, use the `:` between them
# Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
PROP_APP_ABI=armeabi-v7a
PROP_APP_ABI=arm64-v8a
# fill in sign information for release mode
# RELEASE_STORE_FILE=
@@ -38,7 +38,7 @@ android {
res.srcDirs "../res", 'res'
jniLibs.srcDirs "../libs", 'libs'
manifest.srcFile "AndroidManifest.xml"
assets.srcDir "assets"
assets.srcDir "${RES_PATH}/assets"
jniLibs {
// Vulkan validation layer
// srcDir "${android.ndkDirectory}/sources/third_party/vulkan/src/build-android/jniLibs"
@@ -85,28 +85,6 @@ android {
}
}
android.applicationVariants.all { variant ->
def outputDir ="${projectDir}/assets"
def sourceDir = "${RES_PATH}/assets"
// assert file("${sourceDir}/res").exists()
delete "${outputDir}"
def targetName = variant.name.capitalize()
def copyTaskName = "copy${targetName}ResourcesToAssets"
tasks.register(copyTaskName) {
copy {
from sourceDir
into outputDir
}
}
tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
}
dependencies {
implementation fileTree(dir: '../libs', include: ['*.jar','*.aar'])
implementation fileTree(dir: 'libs', include: ['*.jar','*.aar'])
@@ -38,7 +38,7 @@ android {
res.srcDirs "../res", 'res'
jniLibs.srcDirs "../libs", 'libs'
manifest.srcFile "AndroidManifest.xml"
assets.srcDir "assets"
assets.srcDir "${RES_PATH}/assets"
}
externalNativeBuild {
@@ -81,28 +81,6 @@ android {
}
}
android.applicationVariants.all { variant ->
def outputDir ="${projectDir}/assets"
def sourceDir = "${RES_PATH}/assets"
// assert file("${sourceDir}/res").exists()
delete "${outputDir}"
def targetName = variant.name.capitalize()
def copyTaskName = "copy${targetName}ResourcesToAssets"
tasks.register(copyTaskName) {
copy {
from sourceDir
into outputDir
}
}
tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
}
dependencies {
implementation fileTree(dir: '../libs', include: ['*.jar','*.aar'])
implementation fileTree(dir: 'libs', include: ['*.jar','*.aar'])
+2 -1
View File
@@ -1 +1,2 @@
build
build
entry/src/main/resources/rawfile/
+2 -1
View File
@@ -93,7 +93,8 @@ function build_android()
echo "Compile Android - cmake ..."
echo "ANDORID_NDK ${ANDROID_NDK} or ${ANDROID_NDK_HOME}"
./gradlew assembleDebug --quiet
#./gradlew assembleDebug --quiet
./gradlew :CocosGame:assembleDebug --quiet
echo "Compile Android Debug Done!"
# ./gradlew assembleRelease # --quiet
# echo "Compile Android Release Done!"