From 04ed60fa25b50f8e8420fc6cfe956220b5d82a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Thu, 29 Aug 2024 15:13:35 -0700
Subject: [PATCH] bpf: git mv netd bpf/netd (plus update visibility for new
 path)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Another step towards moving all bpf related stuff into a common directory.

In practice netd_updatable is only actually used for bpf...

The upcoming netbpfload UML test should be checking netd_updatable's
initialization succeeds (useful since that opens a bunch of maps
fetches some programs, and attaches them to a bunch of cgroup hooks).

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I65a0fbbf18bf0aa87938df691c0a9ebcca9a084c
---
 {netd => bpf/netd}/Android.bp                    | 0
 {netd => bpf/netd}/BpfBaseTest.cpp               | 0
 {netd => bpf/netd}/BpfHandler.cpp                | 0
 {netd => bpf/netd}/BpfHandler.h                  | 0
 {netd => bpf/netd}/BpfHandlerTest.cpp            | 0
 {netd => bpf/netd}/NetdUpdatable.cpp             | 0
 {netd => bpf/netd}/include/NetdUpdatablePublic.h | 0
 {netd => bpf/netd}/libnetd_updatable.map.txt     | 0
 bpf/progs/Android.bp                             | 2 +-
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename {netd => bpf/netd}/Android.bp (100%)
 rename {netd => bpf/netd}/BpfBaseTest.cpp (100%)
 rename {netd => bpf/netd}/BpfHandler.cpp (100%)
 rename {netd => bpf/netd}/BpfHandler.h (100%)
 rename {netd => bpf/netd}/BpfHandlerTest.cpp (100%)
 rename {netd => bpf/netd}/NetdUpdatable.cpp (100%)
 rename {netd => bpf/netd}/include/NetdUpdatablePublic.h (100%)
 rename {netd => bpf/netd}/libnetd_updatable.map.txt (100%)

diff --git a/netd/Android.bp b/bpf/netd/Android.bp
similarity index 100%
rename from netd/Android.bp
rename to bpf/netd/Android.bp
diff --git a/netd/BpfBaseTest.cpp b/bpf/netd/BpfBaseTest.cpp
similarity index 100%
rename from netd/BpfBaseTest.cpp
rename to bpf/netd/BpfBaseTest.cpp
diff --git a/netd/BpfHandler.cpp b/bpf/netd/BpfHandler.cpp
similarity index 100%
rename from netd/BpfHandler.cpp
rename to bpf/netd/BpfHandler.cpp
diff --git a/netd/BpfHandler.h b/bpf/netd/BpfHandler.h
similarity index 100%
rename from netd/BpfHandler.h
rename to bpf/netd/BpfHandler.h
diff --git a/netd/BpfHandlerTest.cpp b/bpf/netd/BpfHandlerTest.cpp
similarity index 100%
rename from netd/BpfHandlerTest.cpp
rename to bpf/netd/BpfHandlerTest.cpp
diff --git a/netd/NetdUpdatable.cpp b/bpf/netd/NetdUpdatable.cpp
similarity index 100%
rename from netd/NetdUpdatable.cpp
rename to bpf/netd/NetdUpdatable.cpp
diff --git a/netd/include/NetdUpdatablePublic.h b/bpf/netd/include/NetdUpdatablePublic.h
similarity index 100%
rename from netd/include/NetdUpdatablePublic.h
rename to bpf/netd/include/NetdUpdatablePublic.h
diff --git a/netd/libnetd_updatable.map.txt b/bpf/netd/libnetd_updatable.map.txt
similarity index 100%
rename from netd/libnetd_updatable.map.txt
rename to bpf/netd/libnetd_updatable.map.txt
diff --git a/bpf/progs/Android.bp b/bpf/progs/Android.bp
index f6717c5d06..dc1f56d9f6 100644
--- a/bpf/progs/Android.bp
+++ b/bpf/progs/Android.bp
@@ -47,8 +47,8 @@ cc_library_headers {
         "com.android.tethering",
     ],
     visibility: [
+        "//packages/modules/Connectivity/bpf/netd",
         "//packages/modules/Connectivity/DnsResolver",
-        "//packages/modules/Connectivity/netd",
         "//packages/modules/Connectivity/service",
         "//packages/modules/Connectivity/service/native/libs/libclat",
         "//packages/modules/Connectivity/Tethering",