From 3111fc1eba08ed6e019fd937cde663b57ef6bae0 Mon Sep 17 00:00:00 2001 From: cfig Date: Tue, 23 Jun 2020 13:12:37 +0800 Subject: [PATCH] mass update support super.img add 'pull' task clean up obsolete makefiles --- Makefile | 14 -------- aosp/libavb1.1/Makefile | 26 -------------- aosp/libsparse/Makefile | 27 -------------- aosp/libsparse/base/Makefile | 20 ----------- aosp/libsparse/sparse/Makefile | 20 ----------- aosp/mkbootfs.10/Makefile | 19 ---------- aosp/mkbootfs.10/build.gradle | 2 +- avbImpl/Makefile | 34 ------------------ avbImpl/build.gradle | 4 +-- avbImpl/config/pubkey | Bin 0 -> 1032 bytes .../src/main/kotlin/packable/BootImgParser.kt | 4 +++ .../src/main/kotlin/packable/IPackable.kt | 15 ++++++++ .../src/main/kotlin/packable/VBMetaParser.kt | 4 +++ .../kotlin/sparse_util/SparseImgParser.kt | 2 +- build.gradle.kts | 11 ++++++ 15 files changed, 38 insertions(+), 164 deletions(-) delete mode 100644 Makefile delete mode 100644 aosp/libavb1.1/Makefile delete mode 100644 aosp/libsparse/Makefile delete mode 100644 aosp/libsparse/base/Makefile delete mode 100644 aosp/libsparse/sparse/Makefile delete mode 100644 aosp/mkbootfs.10/Makefile delete mode 100644 avbImpl/Makefile create mode 100644 avbImpl/config/pubkey diff --git a/Makefile b/Makefile deleted file mode 100644 index d933fb1..0000000 --- a/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -all: - -git apply external/remove_projects.diff - make -C aosp/mkbootfs - make -C aosp/libsparse/base/ - make -C aosp/libsparse/sparse/ - make -C aosp/libsparse - make -C aosp/libavb -clean: - -git apply -R external/remove_projects.diff - make clean -C aosp/mkbootfs - make clean -C aosp/libsparse/base/ - make clean -C aosp/libsparse/sparse/ - make clean -C aosp/libsparse - make clean -C aosp/libavb diff --git a/aosp/libavb1.1/Makefile b/aosp/libavb1.1/Makefile deleted file mode 100644 index 36d33e6..0000000 --- a/aosp/libavb1.1/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -.PHONY: clean nativeLibrary -.DEFAULT_GOAL: nativeLibrary -src_dir := src/avb/c -header_dir := src/avb/headers -build_dir := build -CFLAGS := \ - -I$(header_dir) \ - -D_FILE_OFFSET_BITS=64 \ - -D_POSIX_C_SOURCE=199309L \ - -DAVB_ENABLE_DEBUG \ - -DAVB_COMPILATION \ - -Wall -g -nativeLibrary: build/libs/avb/shared/libavb.dylib -CPP_FILES := $(wildcard src/avb/c/*.c) -OBJ_FILES := $(patsubst src/avb/c/%,build/%,$(CPP_FILES:.c=.o)) - -clean: - rm -fr $(build_dir) - -build/%.o: $(src_dir)/%.c - mkdir -p $(dir $@) - $(CC) -fPIC $(CFLAGS) -c -o $@ $< - -build/libs/avb/shared/libavb.dylib: $(OBJ_FILES) - mkdir -p $(dir $@) - $(CC) -shared -fPIC $^ -o $@ diff --git a/aosp/libsparse/Makefile b/aosp/libsparse/Makefile deleted file mode 100644 index 7afb864..0000000 --- a/aosp/libsparse/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -.PHONY: nativeExecutable clean -osSuffix := linux -nativeExecutable: \ - build/append2simg \ - simg2img/build/install/main/release/$(osSuffix)/simg2img \ - build/simg2simg \ - build/img2simg -CFLAGS := -Isparse/src/main/public -LDFLAGS := \ - -Lsparse/build/lib/main/release/linux/ -lsparse \ - -Lbase/build/lib/main/release/linux/ -lbase \ - -lz -build/append2simg: append2simg/src/main/cpp/append2simg.cpp - mkdir -p $(dir $@) - $(CXX) $^ $(CFLAGS) $(LDFLAGS) -o $@ -simg2img/build/install/main/release/$(osSuffix)/simg2img: simg2img/src/main/cpp/simg2img.cpp - mkdir -p $(dir $@) - $(CXX) $^ $(CFLAGS) $(LDFLAGS) -o $@ -build/img2simg: img2simg/src/main/cpp/img2simg.cpp - mkdir -p $(dir $@) - $(CXX) $^ $(CFLAGS) $(LDFLAGS) -o $@ -build/simg2simg: simg2simg/src/main/cpp/simg2simg.cpp - mkdir -p $(dir $@) - $(CXX) $^ $(CFLAGS) $(LDFLAGS) -o $@ -clean: - rm -fr build - rm -fr simg2img/build/ diff --git a/aosp/libsparse/base/Makefile b/aosp/libsparse/base/Makefile deleted file mode 100644 index efd3c20..0000000 --- a/aosp/libsparse/base/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -.PHONY: clean nativeLibrary -.DEFAULT_GOAL: nativeLibrary -src_dir := src/main/cpp -header_dir := src/main/public -build_dir := build -CFLAGS := -nativeLibrary: build/lib/main/release/linux/libbase.a -CPP_FILES := $(wildcard $(src_dir)/*.cpp) -OBJ_FILES := $(patsubst $(src_dir)/%,build/%,$(CPP_FILES:.cpp=.o)) - -clean: - rm -fr $(build_dir) - -build/%.o: $(src_dir)/%.cpp - mkdir -p $(dir $@) - $(CC) $(CFLAGS) -c -o $@ $< - -build/lib/main/release/linux/libbase.a: $(OBJ_FILES) - mkdir -p $(dir $@) - ar rcs $@ $^ diff --git a/aosp/libsparse/sparse/Makefile b/aosp/libsparse/sparse/Makefile deleted file mode 100644 index 4246422..0000000 --- a/aosp/libsparse/sparse/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -.PHONY: clean nativeLibrary -.DEFAULT_GOAL: nativeLibrary -src_dir := src/main/cpp -header_dir := src/main/public -build_dir := build -CFLAGS := -I$(header_dir) -I../base/src/main/public/ -nativeLibrary: build/lib/main/release/linux/libsparse.a -CPP_FILES := $(wildcard $(src_dir)/*.cpp) -OBJ_FILES := $(patsubst $(src_dir)/%,build/%,$(CPP_FILES:.cpp=.o)) - -clean: - rm -fr $(build_dir) - -build/%.o: $(src_dir)/%.cpp - mkdir -p $(dir $@) - $(CC) $(CFLAGS) -c -o $@ $< - -build/lib/main/release/linux/libsparse.a: $(OBJ_FILES) - mkdir -p $(dir $@) - ar rcs $@ $^ diff --git a/aosp/mkbootfs.10/Makefile b/aosp/mkbootfs.10/Makefile deleted file mode 100644 index 2e7a9b8..0000000 --- a/aosp/mkbootfs.10/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -src_dir := src/mkbootfs/cpp -header_dir := src/mkbootfs/headers -build_dir := build -CXX_FLAGS := -I$(header_dir) -std=gnu++11 -Wno-write-strings -D__ANDROID_VNDK__ - -.PHONY: clean nativeExecutable -nativeExecutable: $(build_dir)/exe/mkbootfs/mkbootfs -$(build_dir)/exe/mkbootfs/mkbootfs: $(build_dir)/fs_config.o $(build_dir)/mkbootfs.o |$(build_dir)/exe/mkbootfs - $(CXX) $^ -o $@ -$(build_dir)/fs_config.o: $(src_dir)/fs_config.cpp |$(build_dir) - $(CXX) -c $(CXX_FLAGS) $< -o $@ -$(build_dir)/mkbootfs.o: $(src_dir)/mkbootfs.c |$(build_dir) - $(CXX) -c $(CXX_FLAGS) $< -o $@ -$(build_dir): - mkdir $@ -$(build_dir)/exe/mkbootfs: |$(build_dir) - mkdir -p $@ -clean: - rm -rf $(build_dir) diff --git a/aosp/mkbootfs.10/build.gradle b/aosp/mkbootfs.10/build.gradle index 8d7f6cd..0c8f4a7 100644 --- a/aosp/mkbootfs.10/build.gradle +++ b/aosp/mkbootfs.10/build.gradle @@ -11,7 +11,7 @@ model { binaries.all { cppCompiler.define "__ANDROID_VNDK__" //cppCompiler.define 'CFIG_NO_FIX_STAT' - cppCompiler.args << '-std=gnu++11' << "-Wno-write-strings" + cppCompiler.args << "-Wno-write-strings" } } } diff --git a/avbImpl/Makefile b/avbImpl/Makefile deleted file mode 100644 index f2a047f..0000000 --- a/avbImpl/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -.PHONY: clean nativeLibrary -.DEFAULT_GOAL: nativeLibrary - -src_dir := src/avbx/cpp -header_dir := src/avbx/headers -build_dir := build -CFLAGS := @build/tmp/compileAvbxStaticLibraryAvbxCpp/options.txt -LD_FLAGS := -lavb -L ../aosp/libavb/build/libs/avb/shared - -CPP_FILES := $(wildcard $(src_dir)/*.cpp) -OBJ_FILES := $(patsubst $(src_dir)/%,build/%,$(CPP_FILES:.cpp=.o)) - -clean: - rm -fr $(build_dir) - -build/%.o: $(src_dir)/%.cpp - mkdir -p $(dir $@) - $(CXX) -fPIC $(CFLAGS) -o $@ $< - -build/libavbxShared.so: $(OBJ_FILES) - $(CXX) -shared -fPIC $^ $(LD_FLAGS) -o $@ - -build/libavbxStatic.a: $(OBJ_FILES) - $(warning $(OBJ_FILES)) - ar rcs $@ $^ - -build/avbxVerifier.o: src/avbVerifier/cpp/main.cpp - $(CXX) $^ @build/tmp/compileAvbVerifierExecutableAvbVerifierCpp/options.txt -o $@ -build/avbxVerifier: build/libavbxStatic.a -build/avbxVerifier: build/avbxVerifier.o - $(CXX) $< \ - -lavb -L ../aosp/libavb/build/libs/avb/static \ - -lavbxStatic -L build \ - -o $@ diff --git a/avbImpl/build.gradle b/avbImpl/build.gradle index 2d8616f..8d786d1 100644 --- a/avbImpl/build.gradle +++ b/avbImpl/build.gradle @@ -16,7 +16,7 @@ model { } binaries.all { cCompiler.args << "-Wall" << "-g" - cppCompiler.args << "--std=c++11" + cppCompiler.args << "-std=c++17" } } @@ -29,7 +29,7 @@ model { } binaries.all { cppCompiler.define "XXX" - cppCompiler.args << '-std=c++11' + cppCompiler.args << '-std=c++17' } } } diff --git a/avbImpl/config/pubkey b/avbImpl/config/pubkey new file mode 100644 index 0000000000000000000000000000000000000000..f2e8fbdee4417acc0fa4410f107a7dd70b19068c GIT binary patch literal 1032 zcmV+j1o!&@01yCG*#xcF1h3=Mglv8di9N!M(-KwbV#)CjUd$G9t3-S(WlEH_7ApX| z2JaIGQ%w0}xhQ%YgqVofXQU(fr%T*Q5BEA4u2iTM{;;jAHQGC^C%mud(=RtP)=?{L zS|`_*2Cr+lfXezXw6TS=O{%KH7Bm{T=g0c_33scPlj}sT&mg?;fDzjx3`cRfZPt5W zM~4h_NK4hfP6(>kCBsJMEwzcF)SSmVva zyuuM3p-R90Cw-yzHKSh2+*dC?@X1|7rgGS=f0+{{u`Wq5xWs!cn0W`Fr$SftwgdHP|f$>8%enbQPnHi_9n5d|l-F1k(iz zx;nB+MK4Fk4M9JbfK5NawYzX%r#G)iA`(R|^$&-V;)DVD5)Tv=B+iMM?zzMlaBvms zzQ$}HVzcxu7Ki&*9!0CJGUQ&7?Ner6z3r{$5;+Zn$>?irEv4?nT4t_{m)8w!NyqiX zk}-=3?lan{H?~O__zqx2$TN}eAXgB+crAk_*2-b|FW|ogFj86)8~~?X%zQ4zm5ZZ0 z@Ix+M-2mGSvp1Qk&78MG_ccTz!h&(DjjFUk5$qm~{1k$cPJ?O+Yc*b7>0Hc=-Z{}q zTVG?TWZ(+R3%FW*!wcrV{)-QNG>!shbOCJ2cC3772roYxrYvBy|JseX5)1%;%uu0R zWTE0;GG)n}zSas8hde4pM-0kBg8GSN=ZUnB_a5dWrO;V7d6L)8J^kaM3(stYpk?!1 z#!6#fZaO+Di)ywnyZEw8V!RrWC1&Gk%3w(g_KLnfc2mN7s00^v@$&;>8-=p4?|>Dy z)K1@VtlKIC)U+YGWmZ?{`h=o=6ArJ}npi5MfrO0-plZRp+4Y93y>(#;=8Qdevh6S+ z^QvT8?*)^F>xG8&2~z5HjSf+i%NR*hsYHVH#zogfEn*x zsAkR^7I`7x*D)}}A>A}v(i$s1UH9tB1&+7NNiLw{^ruJ}5S#?3^eA-5Z(|@UMkFQ~ z9nmZ?ZCWX!2Bxw>%nB!#36`u!Wq4>&nAX^)Euhcr;&k$Y04CH!AJjj=O)vq=Fzaa9gcx?v{z>gBcQs?W`qpVq-& zQ<1F&-XP~u+FO-p?ey+KWpEP { - return listOf("^(system|vendor|product|cache|userdata)\\.img$") + return listOf("^(system|vendor|product|cache|userdata|super)\\.img$") } override fun unpack(fileName: String) { diff --git a/build.gradle.kts b/build.gradle.kts index ac77985..bf076be 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -61,6 +61,17 @@ tasks { } flashTask.dependsOn("bbootimg:jar") + + val pullTask by register("pull", JavaExec::class) { + group = GROUP_ANDROID + main = "cfig.packable.PackableLauncherKt" + classpath = files("bbootimg/build/libs/bbootimg.jar") + this.maxHeapSize = "512m" + enableAssertions = true + args("pull") + } + pullTask.dependsOn("bbootimg:jar") + //sparse image dependencies packTask.dependsOn("aosp:mkbootfs.10:mkbootfsExecutable") packTask.dependsOn("aosp:mkbootfs.11:mkbootfsExecutable")