staging

Author: cfig

.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: |

.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

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