From 9e5743581745e2d1de02b386c6e6d69e43033c3a Mon Sep 17 00:00:00 2001 From: YuKongA <1348547200@qq.com> Date: Fri, 11 Mar 2022 20:55:39 +0800 Subject: [PATCH] Try fix build --- .github/workflows/android.yml | 4 +++- .gitmodules | 2 +- app/build.gradle.kts | 3 +-- app/src/main/cpp/CMakeLists.txt | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 07ed3db4..017c17fc 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,8 +32,10 @@ jobs: path: | ~/.gradle/caches/build-cache-* key: gradle-builds-${{ github.sha }} - - name: Clone UI + - name: Clone blockmiui run: git clone https://github.com/Block-Network/blockmiui.git + - name: Clone DexBuilder + run: git clone https://github.com/LSPosed/DexBuilder.git - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/.gitmodules b/.gitmodules index 4dcb4781..0616fc51 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://github.com/577fkj/blockmiui.git [submodule "app/src/main/cpp/dex_builder"] path = app/src/main/cpp/dex_builder - url = https://github.com/LSPosed/DexBuilder + url = https://github.com/LSPosed/DexBuilder.git diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ca48cb36..9349210f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -27,7 +27,6 @@ android { buildTypes { release { isMinifyEnabled = true - isZipAlignEnabled = true isShrinkResources = true setProguardFiles( listOf( @@ -58,7 +57,7 @@ android { applicationVariants.all { outputs.all { (this as BaseVariantOutputImpl).outputFileName = - "Simplicity_Tools_Xposed-${versionName}-${name}.apk" + "Simplicity_Tools_Xposed-$versionName-$name.apk" } } androidResources { diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index 9c7d7553..a79e3ef1 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 3.18.1) - set(CMAKE_CXX_STANDARD 17) set(CMAKE_C_STANDARD 11) @@ -12,11 +11,13 @@ add_library( native.cpp biliroaming.cc ) + target_include_directories(DexBuilder PUBLIC dex_builder/include) find_library( log-lib - log) + log + ) target_link_libraries( DexBuilder