Merge pull request facebookexperimental#107 from simpleton/main

update bpftrace to v0.21.2
simpleton · Dec 17, 2024 · 93e273d · 93e273d
2 parents 8b26547 + 8d5b05f
commit 93e273d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/projects/bpftrace/build.mk b/projects/bpftrace/build.mk
@@ -43,8 +43,8 @@ $(STRIP_THUNK): projects/bpftrace/strip-thunk | $(HOST_OUT_DIR)
 	@sed -e "s+<STRIP_PATH>+$(ANDROID_TOOLCHAIN_STRIP_PATH)+g" $< > $@
 	chmod +x $@
 
-BPFTRACE_COMMIT = a77b8061f9291793e15c54a19a2202643d900387
+BPFTRACE_COMMIT = v0.21.2
 BPFTRACE_REPO = https://github.com/iovisor/bpftrace.git/
 projects/bpftrace/sources:
 	git clone $(BPFTRACE_REPO) $@
-	cd $@ && git checkout $(BPFTRACE_COMMIT)
+	cd $@ && git checkout $(BPFTRACE_COMMIT) && git cherry-pick a77b8061f9291793e15c54a19a2202643d900387 --no-commit
diff --git a/projects/libbpf/build.mk b/projects/libbpf/build.mk
@@ -25,7 +25,7 @@ $(LIBBPF_ANDROID): $(ANDROID_OUT_DIR)/lib/pkgconfig/zlib.pc
 $(LIBBPF_ANDROID_BUILD_DIR):
 	mkdir -p $@
 
-LIBBPF_TAG = v1.4.6
+LIBBPF_TAG = v1.5.0
 LIBBPF_REPO = https://github.com/libbpf/libbpf
 projects/libbpf/sources:
 	git clone $(LIBBPF_REPO) $@ -b $(LIBBPF_TAG)