From 608e05314a1ca08131f88217fd167493d25f5bba Mon Sep 17 00:00:00 2001
From: cfig <yuyezhong@gmail.com>
Date: Mon, 16 Sep 2024 19:01:16 +0800
Subject: [PATCH] staging
---
.github/workflows/main.yml | 3 ---
.gitmodules | 6 +++---
tools/release.mk | 9 ++++++++-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 47106bb..16d54c5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,9 +37,6 @@ jobs:
- name: Unit Test
run: ./gradlew check && ./gradlew clean || true
- - name: enable gradle native
- run: sed -i "s/bHackingMode = false/bHackingMode = true/g" build.gradle.kts
-
# Runs a set of commands using the runners shell
- name: Integration Test
run: |
diff --git a/.gitmodules b/.gitmodules
index 5e8ae90..188ddb9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
[submodule "src/integrationTest/resources"]
path = src/integrationTest/resources
url = https://github.com/cfig/android_image_res
-[submodule "src/integrationTest/resources_3"]
- path = src/integrationTest/resources_3
- url = https://github.com/cfig/android_image_res3.git
[submodule "src/integrationTest/resources_2"]
path = src/integrationTest/resources_2
url = https://github.com/cfig/android_image_res2.git
+[submodule "src/integrationTest/resources_3"]
+ path = src/integrationTest/resources_3
+ url = https://github.com/cfig/android_image_res3.git
diff --git a/tools/release.mk b/tools/release.mk
index b8a6802..f934f2e 100644
--- a/tools/release.mk
+++ b/tools/release.mk
@@ -36,13 +36,20 @@ endef
export gw gw_win
all:
cd ../bbootimg && gradle build
+ cd ../ && gradle aosp:apksigner:build
cp ../bbootimg/build/libs/bbootimg.jar .
cd ../aosp/boot_signer && gradle build
cp ../aosp/boot_signer/build/libs/boot_signer.jar .
+ cp ../aosp/apksigner/build/libs/apksigner-1.0.jar .
cd .. && rm -fr avbImpl bbootimg build build.gradle.kts gradle gradlew gradlew.bat settings.gradle.kts
cd ../aosp && rm -r libavb1.1 libavb1.2 mkbootfs.10 mkbootfs.11
rm -r ../aosp/boot_signer
- mkdir -p ../aosp/boot_signer/build/libs/ && mv boot_signer.jar ../aosp/boot_signer/build/libs/
+ rm -fr ../helper
+ rm -fr ../lazybox
+ rm -fr ../aosp/apksigner
+ rm -fr ../aosp/bouncycastle
+ mkdir -p ../aosp/boot_signer/build/libs/ && mv -v boot_signer.jar ../aosp/boot_signer/build/libs/
+ mkdir -p ../aosp/apksigner/build/libs/ && mv -v apksigner-1.0.jar ../aosp/apksigner/build/libs/
mkdir ../bbootimg && mv bbootimg.jar ../bbootimg/
echo $$gw > gradlew
chmod 755 gradlew