From 2bb5b7ebee4f01f9e09c9fdf2f5816243c8e1a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Thu, 26 Sep 2024 18:57:04 -0700
Subject: [PATCH] bpf: git mv DnsResolver bpf/dns_helper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is entirely bpf specific logic for the dns_helper.so
shared library.  Let's put it under bpf/ so it can be covered
by bpf source hash logic and used by UML NetBpfLoad test.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7b544cb1db9f13f2467519068cefd236b814413a
---
 {DnsResolver => bpf/dns_helper}/Android.bp                      | 0
 {DnsResolver => bpf/dns_helper}/DnsBpfHelper.cpp                | 0
 {DnsResolver => bpf/dns_helper}/DnsBpfHelper.h                  | 0
 {DnsResolver => bpf/dns_helper}/DnsBpfHelperTest.cpp            | 0
 {DnsResolver => bpf/dns_helper}/DnsHelper.cpp                   | 0
 {DnsResolver => bpf/dns_helper}/include/DnsHelperPublic.h       | 0
 .../dns_helper}/libcom.android.tethering.dns_helper.map.txt     | 0
 bpf/progs/Android.bp                                            | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename {DnsResolver => bpf/dns_helper}/Android.bp (100%)
 rename {DnsResolver => bpf/dns_helper}/DnsBpfHelper.cpp (100%)
 rename {DnsResolver => bpf/dns_helper}/DnsBpfHelper.h (100%)
 rename {DnsResolver => bpf/dns_helper}/DnsBpfHelperTest.cpp (100%)
 rename {DnsResolver => bpf/dns_helper}/DnsHelper.cpp (100%)
 rename {DnsResolver => bpf/dns_helper}/include/DnsHelperPublic.h (100%)
 rename {DnsResolver => bpf/dns_helper}/libcom.android.tethering.dns_helper.map.txt (100%)

diff --git a/DnsResolver/Android.bp b/bpf/dns_helper/Android.bp
similarity index 100%
rename from DnsResolver/Android.bp
rename to bpf/dns_helper/Android.bp
diff --git a/DnsResolver/DnsBpfHelper.cpp b/bpf/dns_helper/DnsBpfHelper.cpp
similarity index 100%
rename from DnsResolver/DnsBpfHelper.cpp
rename to bpf/dns_helper/DnsBpfHelper.cpp
diff --git a/DnsResolver/DnsBpfHelper.h b/bpf/dns_helper/DnsBpfHelper.h
similarity index 100%
rename from DnsResolver/DnsBpfHelper.h
rename to bpf/dns_helper/DnsBpfHelper.h
diff --git a/DnsResolver/DnsBpfHelperTest.cpp b/bpf/dns_helper/DnsBpfHelperTest.cpp
similarity index 100%
rename from DnsResolver/DnsBpfHelperTest.cpp
rename to bpf/dns_helper/DnsBpfHelperTest.cpp
diff --git a/DnsResolver/DnsHelper.cpp b/bpf/dns_helper/DnsHelper.cpp
similarity index 100%
rename from DnsResolver/DnsHelper.cpp
rename to bpf/dns_helper/DnsHelper.cpp
diff --git a/DnsResolver/include/DnsHelperPublic.h b/bpf/dns_helper/include/DnsHelperPublic.h
similarity index 100%
rename from DnsResolver/include/DnsHelperPublic.h
rename to bpf/dns_helper/include/DnsHelperPublic.h
diff --git a/DnsResolver/libcom.android.tethering.dns_helper.map.txt b/bpf/dns_helper/libcom.android.tethering.dns_helper.map.txt
similarity index 100%
rename from DnsResolver/libcom.android.tethering.dns_helper.map.txt
rename to bpf/dns_helper/libcom.android.tethering.dns_helper.map.txt
diff --git a/bpf/progs/Android.bp b/bpf/progs/Android.bp
index 52eb1b3ef5..20d194c5ab 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/dns_helper",
         "//packages/modules/Connectivity/bpf/netd",
-        "//packages/modules/Connectivity/DnsResolver",
         "//packages/modules/Connectivity/service",
         "//packages/modules/Connectivity/service/native/libs/libclat",
         "//packages/modules/Connectivity/Tethering",