move libbpf_android into loader subdirectory
The only (real) user is the platform bpfloader binary.
This is a library purely to facilitate testing.
It's easier to develop / code-search if everything is in the same directory.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iebe8a5c4f8bb9ada220acec6ed8c1be0fc9d438c
diff --git a/libbpf_android/Android.bp b/libbpf_android/Android.bp
deleted file mode 100644
index be8c185..0000000
--- a/libbpf_android/Android.bp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (C) 2018 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-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":
- // SPDX-license-identifier-Apache-2.0
- 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,
-}
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",
diff --git a/libbpf_android/BpfLoadTest.cpp b/loader/BpfLoadTest.cpp
similarity index 100%
rename from libbpf_android/BpfLoadTest.cpp
rename to loader/BpfLoadTest.cpp
diff --git a/libbpf_android/Loader.cpp b/loader/Loader.cpp
similarity index 100%
rename from libbpf_android/Loader.cpp
rename to loader/Loader.cpp
diff --git a/libbpf_android/include/libbpf_android.h b/loader/include/libbpf_android.h
similarity index 100%
rename from libbpf_android/include/libbpf_android.h
rename to loader/include/libbpf_android.h
