diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-30 10:54:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-09-30 10:54:02 +0000 |
| commit | 288003f14a1b041ce51aff19ff9ef7e0e40bdd05 (patch) | |
| tree | eeb46460bbe7a98371977f8ac342cb05b9c2ae65 | |
| parent | cfbc1510dbdfb3e93ed7bf675e7197a917c13ed3 (diff) | |
| parent | e589944063e3712bec604c50af256faeca459483 (diff) | |
| download | build-288003f14a1b041ce51aff19ff9ef7e0e40bdd05.tar.gz | |
Merge "hermetic build: use toybox cpio"
| l--------- | build-tools/path/linux-x86/cpio | 1 | ||||
| -rw-r--r-- | hermetic/Dockerfile | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/build-tools/path/linux-x86/cpio b/build-tools/path/linux-x86/cpio new file mode 120000 index 00000000..4bf115b8 --- /dev/null +++ b/build-tools/path/linux-x86/cpio @@ -0,0 +1 @@ +../../../../prebuilts/build-tools/linux-x86/bin/toybox
\ No newline at end of file diff --git a/hermetic/Dockerfile b/hermetic/Dockerfile index c7ac3890..502e6b61 100644 --- a/hermetic/Dockerfile +++ b/hermetic/Dockerfile @@ -5,8 +5,6 @@ RUN apt-get -y update \ # Those are likely essential git \ # To be removed - # see b/164026334 - cpio \ libc6-dev \ libssl-dev \ rsync \ @@ -15,7 +13,6 @@ RUN apt-get -y update \ # Explicitly allow some host binaries for now RUN mkdir -p /l/bin -RUN ln -s $(which cpio) /l/bin/ # b/164026334 RUN ln -s $(which perl) /l/bin/ RUN ln -s $(which rsync) /l/bin/ RUN ln -s $(which sh) /l/bin/ |