mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-24 20:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build minijail through build.rs file in CI containers

Browse source 
This removes the minijail build from build_environment, which will
cause the minijail-sys crate to build it from source.

Minijail is upreved to include https://r.android.com/1815277

BUG=b:198305518
TEST=./test_all

Change-Id: I38c46c2a7df43e3d3a94ae0c5f8a9aae2abd3555
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3141770
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Dennis Kempin 2021-09-01 13:43:25 -07:00 committed by Commit Bot
parent de86c8253d
commit 3407843bd4
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ci/build_environment/Makefile
View file

@ -24,7 +24,7 @@ endif
PYTHONDONTWRITEBYTECODE = y
all: $(LIB) minijail minigbm virglrenderer
all: $(LIB) minigbm virglrenderer
ldconfig $(LIB)
clean:
@ -35,12 +35,6 @@ clean:
# These are phony targets so that we can delegate the dirty-check to the
# underlying build system for each library.
minijail:
mkdir -p $(BUILD)/minijail
$(MAKE) -C $(SRC)/third_party/minijail \
OUT=$(BUILD)/minijail \
CROSS_COMPILE=$(CROSS_COMPILE)
minigbm:
mkdir -p $(BUILD)/minigbm
$(MAKE) -C $(SRC)/third_party/minigbm \
@ -71,11 +65,6 @@ endif
$(LIB):
mkdir -p $(LIB) $(LIB)/pkgconfig
# minijail
ln -sf $(BUILD)/minijail/libminijail.so $(LIB)
ln -sf $(LIB)/libminijail.so $(LIB)/libminijail.so.1
ln -sf $(MAKEFILE_DIR)/pkgconfig/libminijail.pc $(LIB)/pkgconfig/
# minigbm
ln -sf $(BUILD)/minigbm/libminigbm.so.1.0.0 $(LIB)/libgbm.so
ln -sf $(LIB)/libgbm.so $(LIB)/libgbm.so.1
@ -86,4 +75,4 @@ $(LIB):
ln -sf $(LIB)/libvirglrenderer.so $(LIB)/libvirglrenderer.so.1
ln -sf $(BUILD)/virglrenderer/virglrenderer.pc $(LIB)/pkgconfig/
.PHONY: all clean minijail sysroot minigbm virglrenderer
.PHONY: all clean sysroot minigbm virglrenderer

2
third_party/minijail vendored

@ -1 +1 @@
Subproject commit 94cff17da47df59f567b64fd8e87795fcae055d4
Subproject commit 5cc0b4179f673dfd01803c26c8e803e6ced07e48