| commit | 10fda939356e6a44545b18705de0f56f2e20a66a | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Aug 21 17:38:55 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 21 17:38:55 2024 +0000 |
| tree | b328f4de1b580508d4cdf0961e3a65a41ffcc736 | |
| parent | 91fb8160b322a9a9350e6b35b6d97f8427f1ff40 [diff] | |
| parent | 6c2a00f0499fe31c620098eae6cdafc0e0aac387 [diff] |
Merge changes from topic "bpf_slash_progs" into main am: 6c2a00f049 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3234528 Change-Id: Ibdfcd4d26c9bc1ba75c81a58e39e8efa95525f61 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/netbpfload/Android.bp b/bpf/loader/Android.bp similarity index 100% rename from netbpfload/Android.bp rename to bpf/loader/Android.bp
diff --git a/netbpfload/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp similarity index 100% rename from netbpfload/NetBpfLoad.cpp rename to bpf/loader/NetBpfLoad.cpp
diff --git a/netbpfload/initrc-doc/README.txt b/bpf/loader/initrc-doc/README.txt similarity index 100% rename from netbpfload/initrc-doc/README.txt rename to bpf/loader/initrc-doc/README.txt
diff --git a/netbpfload/initrc-doc/bpfloader-sdk30-11-R.rc b/bpf/loader/initrc-doc/bpfloader-sdk30-11-R.rc similarity index 100% rename from netbpfload/initrc-doc/bpfloader-sdk30-11-R.rc rename to bpf/loader/initrc-doc/bpfloader-sdk30-11-R.rc
diff --git a/netbpfload/initrc-doc/bpfloader-sdk31-12-S.rc b/bpf/loader/initrc-doc/bpfloader-sdk31-12-S.rc similarity index 100% rename from netbpfload/initrc-doc/bpfloader-sdk31-12-S.rc rename to bpf/loader/initrc-doc/bpfloader-sdk31-12-S.rc
diff --git a/netbpfload/initrc-doc/bpfloader-sdk33-13-T.rc b/bpf/loader/initrc-doc/bpfloader-sdk33-13-T.rc similarity index 100% rename from netbpfload/initrc-doc/bpfloader-sdk33-13-T.rc rename to bpf/loader/initrc-doc/bpfloader-sdk33-13-T.rc
diff --git a/netbpfload/initrc-doc/bpfloader-sdk34-14-U-QPR2.rc b/bpf/loader/initrc-doc/bpfloader-sdk34-14-U-QPR2.rc similarity index 100% rename from netbpfload/initrc-doc/bpfloader-sdk34-14-U-QPR2.rc rename to bpf/loader/initrc-doc/bpfloader-sdk34-14-U-QPR2.rc
diff --git a/netbpfload/initrc-doc/bpfloader-sdk34-14-U.rc b/bpf/loader/initrc-doc/bpfloader-sdk34-14-U.rc similarity index 100% rename from netbpfload/initrc-doc/bpfloader-sdk34-14-U.rc rename to bpf/loader/initrc-doc/bpfloader-sdk34-14-U.rc
diff --git a/netbpfload/netbpfload.33rc b/bpf/loader/netbpfload.33rc similarity index 100% rename from netbpfload/netbpfload.33rc rename to bpf/loader/netbpfload.33rc
diff --git a/netbpfload/netbpfload.35rc b/bpf/loader/netbpfload.35rc similarity index 100% rename from netbpfload/netbpfload.35rc rename to bpf/loader/netbpfload.35rc
diff --git a/netbpfload/netbpfload.rc b/bpf/loader/netbpfload.rc similarity index 100% rename from netbpfload/netbpfload.rc rename to bpf/loader/netbpfload.rc
diff --git a/bpf_progs/Android.bp b/bpf/progs/Android.bp similarity index 100% rename from bpf_progs/Android.bp rename to bpf/progs/Android.bp
diff --git a/bpf_progs/block.c b/bpf/progs/block.c similarity index 100% rename from bpf_progs/block.c rename to bpf/progs/block.c
diff --git a/bpf_progs/bpf_net_helpers.h b/bpf/progs/bpf_net_helpers.h similarity index 100% rename from bpf_progs/bpf_net_helpers.h rename to bpf/progs/bpf_net_helpers.h
diff --git a/bpf_progs/clat_mark.h b/bpf/progs/clat_mark.h similarity index 100% rename from bpf_progs/clat_mark.h rename to bpf/progs/clat_mark.h
diff --git a/bpf_progs/clatd.c b/bpf/progs/clatd.c similarity index 100% rename from bpf_progs/clatd.c rename to bpf/progs/clatd.c
diff --git a/bpf_progs/clatd.h b/bpf/progs/clatd.h similarity index 100% rename from bpf_progs/clatd.h rename to bpf/progs/clatd.h
diff --git a/bpf_progs/dscpPolicy.c b/bpf/progs/dscpPolicy.c similarity index 100% rename from bpf_progs/dscpPolicy.c rename to bpf/progs/dscpPolicy.c
diff --git a/bpf_progs/dscpPolicy.h b/bpf/progs/dscpPolicy.h similarity index 100% rename from bpf_progs/dscpPolicy.h rename to bpf/progs/dscpPolicy.h
diff --git a/bpf_progs/netd.c b/bpf/progs/netd.c similarity index 100% rename from bpf_progs/netd.c rename to bpf/progs/netd.c
diff --git a/bpf_progs/netd.h b/bpf/progs/netd.h similarity index 100% rename from bpf_progs/netd.h rename to bpf/progs/netd.h
diff --git a/bpf_progs/offload.c b/bpf/progs/offload.c similarity index 100% rename from bpf_progs/offload.c rename to bpf/progs/offload.c
diff --git a/bpf_progs/offload.h b/bpf/progs/offload.h similarity index 100% rename from bpf_progs/offload.h rename to bpf/progs/offload.h
diff --git a/bpf_progs/offload@mainline.c b/bpf/progs/offload@mainline.c similarity index 100% rename from bpf_progs/offload@mainline.c rename to bpf/progs/offload@mainline.c
diff --git a/bpf_progs/test.c b/bpf/progs/test.c similarity index 100% rename from bpf_progs/test.c rename to bpf/progs/test.c
diff --git a/bpf_progs/test@mainline.c b/bpf/progs/test@mainline.c similarity index 100% rename from bpf_progs/test@mainline.c rename to bpf/progs/test@mainline.c
diff --git a/staticlibs/native/bpf_syscall_wrappers/Android.bp b/bpf/syscall_wrappers/Android.bp similarity index 100% rename from staticlibs/native/bpf_syscall_wrappers/Android.bp rename to bpf/syscall_wrappers/Android.bp
diff --git a/staticlibs/native/bpf_syscall_wrappers/include/BpfSyscallWrappers.h b/bpf/syscall_wrappers/include/BpfSyscallWrappers.h similarity index 100% rename from staticlibs/native/bpf_syscall_wrappers/include/BpfSyscallWrappers.h rename to bpf/syscall_wrappers/include/BpfSyscallWrappers.h
diff --git a/staticlibs/native/README.md b/staticlibs/native/README.md index 1f505c4..7e0e963 100644 --- a/staticlibs/native/README.md +++ b/staticlibs/native/README.md
@@ -27,4 +27,4 @@ library (`.so`) file, and different versions of the library loaded in the same process by different modules will in general have different versions. It's important that each of these libraries loads the common function from its own library. Static linkage should guarantee this - because static linkage resolves symbols at build time, not runtime. \ No newline at end of file + because static linkage resolves symbols at build time, not runtime.