aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 05:56:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 05:56:53 +0000
commit0cdacb82f2b20251780bf4fef1dad16e3481ca87 (patch)
tree727d9e4a28558d983b033800191449b37cc4f368
parent962b16be07c9baefdc83addaca8f2e1b3b94a081 (diff)
parent8ebeec28530d101abc1013915c9ad0d80764b0a3 (diff)
downloadminijail-0cdacb82f2b20251780bf4fef1dad16e3481ca87.tar.gz
Build dump_constants as a static binary am: cf504ca8d6 am: d161b4f53b am: 8ebeec2853
Change-Id: Ie168fc04da5a66f257d66259d9a51ca681f6b763
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 07336f2..a7c4357 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ all: CC_BINARY(minijail0) CC_LIBRARY(libminijail.so) \
CC_LIBRARY(libminijailpreload.so)
parse_seccomp_policy: CXX_BINARY(parse_seccomp_policy)
-dump_constants: CXX_BINARY(dump_constants)
+dump_constants: CXX_STATIC_BINARY(dump_constants)
tests: TEST(CXX_BINARY(libminijail_unittest)) \
TEST(CXX_BINARY(minijail0_cli_unittest)) \
@@ -147,12 +147,14 @@ CXX_BINARY(parse_seccomp_policy): parse_seccomp_policy.o syscall_filter.o \
clean: CLEAN(parse_seccomp_policy)
-CXX_BINARY(dump_constants): dump_constants.o \
+# Compiling dump_constants as a static executable makes it easy to run under
+# qemu-user, which in turn simplifies cross-compiling bpf policies.
+CXX_STATIC_BINARY(dump_constants): dump_constants.o \
libconstants.gen.o libsyscalls.gen.o
clean: CLEAN(dump_constants)
-constants.json: CXX_BINARY(dump_constants)
+constants.json: CXX_STATIC_BINARY(dump_constants)
./dump_constants > $@
clean: CLEANFILE(constants.json)