diff options
| author | Will McVicker <willmcvicker@google.com> | 2021-01-20 15:29:53 -0800 |
|---|---|---|
| committer | Will McVicker <willmcvicker@google.com> | 2021-01-20 15:29:53 -0800 |
| commit | 4290ffe91c9948ed5f52559179b350e375dc2f8b (patch) | |
| tree | c0662de8f69fd3faf7336f864666b3e27a1e93e8 /build-prebuilts.sh | |
| parent | cf86cf9ac34234903ee6068d2b70eb20d1f1c6a8 (diff) | |
| download | build-tools-4290ffe91c9948ed5f52559179b350e375dc2f8b.tar.gz | |
Add avbtool
This is needed to sign the boot.img generated by the build.sh script.
Bug: 177244312
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I949be23336bd3785c8643989ebc6bc6392782eef
Diffstat (limited to 'build-prebuilts.sh')
| -rwxr-xr-x | build-prebuilts.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/build-prebuilts.sh b/build-prebuilts.sh index ab6174b..ad55343 100755 --- a/build-prebuilts.sh +++ b/build-prebuilts.sh @@ -25,6 +25,7 @@ EOF SOONG_BINARIES=( abidiff abidw + avbtool blk_alloc_to_base_fs build_image build_super_image @@ -51,8 +52,14 @@ EOF binaries="${SOONG_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/}" libraries="${SOONG_LIBRARIES[@]/#/${SOONG_HOST_OUT}/lib64/}" + # TODO: When we have a better method of extracting zips from Soong, use that. + py3_stdlib_zip="${SOONG_OUT}/.intermediates/external/python/cpython3/Lib/py3-stdlib-zip/gen/py3-stdlib.zip" + # Build everything - build/soong/soong_ui.bash --make-mode --skip-make ${binaries} ${libraries} + build/soong/soong_ui.bash --make-mode --skip-make \ + ${binaries} \ + ${libraries} \ + ${py3_stdlib_zip} # Stage binaries mkdir -p ${SOONG_OUT}/dist/bin @@ -73,6 +80,9 @@ EOF cp -a ${TOP}/external/elfutils/libelf/elf-knowledge.h ${include_dir}/elfutils/ cp -a ${TOP}/external/elfutils/version.h ${include_dir}/elfutils/ + unzip -q -d ${SOONG_OUT}/dist/py3-stdlib ${py3_stdlib_zip} + cp -a ${TOP}/external/python/cpython3/LICENSE ${SOONG_OUT}/dist/py3-stdlib/ + # Patch dist dir ( cd ${SOONG_OUT}/dist/ |