diff --git a/loader/Android.bp b/loader/Android.bp
index da45531..087ae27 100644
--- a/loader/Android.bp
+++ b/loader/Android.bp
@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-//
-// bpfLoad binary
-//
 package {
+    default_team: "trendy_team_fwk_core_networking",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_bpf_license":
@@ -25,6 +23,70 @@
     default_applicable_licenses: ["system_bpf_license"],
 }
 
+cc_library {
+    name: "libbpf_android",
+    vendor_available: false,
+    host_supported: false,
+    target: {
+        android: {
+            srcs: [
+                "Loader.cpp",
+            ],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
+        },
+    },
+
+    shared_libs: [
+        "libbase",
+        "libutils",
+        "liblog",
+    ],
+    header_libs: [
+        "bpf_headers",
+    ],
+    export_header_lib_headers: [
+        "bpf_headers",
+    ],
+    export_include_dirs: ["include"],
+
+    defaults: ["bpf_defaults"],
+    cflags: [
+        "-Werror",
+        "-Wall",
+        "-Wextra",
+    ],
+}
+
+cc_test {
+    name: "libbpf_load_test",
+    test_suites: ["general-tests"],
+    header_libs: ["bpf_headers"],
+    srcs: [
+        "BpfLoadTest.cpp",
+    ],
+    defaults: ["bpf_defaults"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-error=unused-variable",
+    ],
+    static_libs: ["libgmock"],
+    shared_libs: [
+        "libbpf_android",
+        "libbpf_bcc",
+        "libbase",
+        "liblog",
+        "libutils",
+    ],
+
+    data: [
+        ":bpfLoadTpProg.o",
+    ],
+    require_root: true,
+}
+
 cc_binary {
     name: "bpfloader",