From 0056fdce27095a8207e600c6cf45a0fdcfefe1ac Mon Sep 17 00:00:00 2001
From: Connor O'Brien <connoro@google.com>
Date: Fri, 21 Jan 2022 18:21:23 -0800
Subject: [PATCH] Test loading both with & without BTF

Add path to a test program with BTF info included to test bpfloader
handles both situations correctly

Test: libbpf_load_test
Bug: 203823368
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: Ibe63cdc2ee59199b687d4006efadb201d4a17f3c
---
 libbpf_android/Android.bp      | 1 +
 libbpf_android/BpfLoadTest.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libbpf_android/Android.bp b/libbpf_android/Android.bp
index abda8b8..9f9eec6 100644
--- a/libbpf_android/Android.bp
+++ b/libbpf_android/Android.bp
@@ -104,6 +104,7 @@ cc_test {
 
     required: [
         "bpf_load_tp_prog.o",
+        "bpf_load_tp_prog_btf.o",
     ],
     require_root: true,
 }
diff --git a/libbpf_android/BpfLoadTest.cpp b/libbpf_android/BpfLoadTest.cpp
index 72c0fc1..715ae95 100644
--- a/libbpf_android/BpfLoadTest.cpp
+++ b/libbpf_android/BpfLoadTest.cpp
@@ -99,7 +99,8 @@ class BpfLoadTest : public TestWithParam<std::string> {
 };
 
 INSTANTIATE_TEST_SUITE_P(BpfLoadTests, BpfLoadTest,
-                         ::testing::Values("/system/etc/bpf/bpf_load_tp_prog.o"));
+                         ::testing::Values("/system/etc/bpf/bpf_load_tp_prog.o",
+                                           "/system/etc/bpf/bpf_load_tp_prog_btf.o"));
 
 TEST_P(BpfLoadTest, bpfCheckMap) {
     checkMapNonZero();