From 8378a4a856fff384cb5d09f99e55ea63e2695d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=9F=E6=88=98?= <40414978+PatriceJiang@users.noreply.github.com> Date: Fri, 18 Jun 2021 10:49:40 +0800 Subject: [PATCH] [3.3] some little fixes (#3626) --- native/CMakeLists.txt | 9 +++++++ .../job-system-dummy/DummyJobGraph.cpp | 2 ++ .../templates/android/build/gradle.properties | 4 ++-- .../android/template/app/build.gradle | 24 +------------------ .../android/template/instantapp/build.gradle | 24 +------------------ native/templates/ohos/.gitignore | 3 ++- native/tools/travis-scripts/run-script.sh | 3 ++- 7 files changed, 19 insertions(+), 50 deletions(-) diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index d796953bee..3bf3f80437 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -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( diff --git a/native/cocos/base/job-system/job-system-dummy/DummyJobGraph.cpp b/native/cocos/base/job-system/job-system-dummy/DummyJobGraph.cpp index fd30a4aeb7..26f1db1fb7 100644 --- a/native/cocos/base/job-system/job-system-dummy/DummyJobGraph.cpp +++ b/native/cocos/base/job-system/job-system-dummy/DummyJobGraph.cpp @@ -25,6 +25,7 @@ #include "base/CoreStd.h" +#include #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); diff --git a/native/templates/android/build/gradle.properties b/native/templates/android/build/gradle.properties index 58d38b8729..bc9b57d383 100644 --- a/native/templates/android/build/gradle.properties +++ b/native/templates/android/build/gradle.properties @@ -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= diff --git a/native/templates/android/template/app/build.gradle b/native/templates/android/template/app/build.gradle index d5f4bbf4bc..52beb35863 100644 --- a/native/templates/android/template/app/build.gradle +++ b/native/templates/android/template/app/build.gradle @@ -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']) diff --git a/native/templates/android/template/instantapp/build.gradle b/native/templates/android/template/instantapp/build.gradle index e8705e5182..75e2d0d84c 100644 --- a/native/templates/android/template/instantapp/build.gradle +++ b/native/templates/android/template/instantapp/build.gradle @@ -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']) diff --git a/native/templates/ohos/.gitignore b/native/templates/ohos/.gitignore index c795b054e5..953ceddfa1 100644 --- a/native/templates/ohos/.gitignore +++ b/native/templates/ohos/.gitignore @@ -1 +1,2 @@ -build \ No newline at end of file +build +entry/src/main/resources/rawfile/ \ No newline at end of file diff --git a/native/tools/travis-scripts/run-script.sh b/native/tools/travis-scripts/run-script.sh index e590f897bb..49370a289a 100755 --- a/native/tools/travis-scripts/run-script.sh +++ b/native/tools/travis-scripts/run-script.sh @@ -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!"