From 3407843bd4e10f903efec5e387c80448e4fbd95d Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Wed, 1 Sep 2021 13:43:25 -0700 Subject: [PATCH] Build minijail through build.rs file in CI containers 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 Commit-Queue: Dennis Kempin Reviewed-by: Daniel Verkamp --- ci/build_environment/Makefile | 15 ++------------- third_party/minijail | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/ci/build_environment/Makefile b/ci/build_environment/Makefile index 3d4ce88a10..4519ccaa41 100644 --- a/ci/build_environment/Makefile +++ b/ci/build_environment/Makefile @@ -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 diff --git a/third_party/minijail b/third_party/minijail index 94cff17da4..5cc0b4179f 160000 --- a/third_party/minijail +++ b/third_party/minijail @@ -1 +1 @@ -Subproject commit 94cff17da47df59f567b64fd8e87795fcae055d4 +Subproject commit 5cc0b4179f673dfd01803c26c8e803e6ced07e48