[NETD-BPF#34] Add a tag for bpf to specify the install folder
Currently, the bpf module netd.o (source system/netd/bpf_progs/netd.c) will be built to /system/etc/bpf/netd.o. In Android T, it will be moved to mainline module com.android.tethering. The expected behavior is: - In T device, it uses the netd.o in mainline module. - In pre-T devices, it uses the original netd, built from platform. However, netd.o will be double loaded if the tethering module is installed in Pre-T devices. Because: 1. bpf in apex is packed into /apex/MAINLINE_MODULE/etc/bpf/ 2. bpf in platform is packed into /system/etc/bpf/ 3. bpfloader in pre-T loads ANY bpf modules under /apex/com.android.tethering/etc/bpf/ and /system/etc/bpf/. We can't change the behavior of bpfloader in pre-T devices. We can't delete the /system/etc/bpf/netd.o from pre-T devices. Both of them are not mainline modules. So the mainlined netd.o needs to be packed into a folder other than /apex/com.android.tethering/etc/bpf/ or /system/etc/bpf/. This commit adds a tag 'sub_dir' for bpf module. The installation path of bpf modules will be: - /system/etc/bpf/SUB_DIR/ (for platform code) - /apex/MAINLINE_MODULE/etc/bpf/SUB_DIR/ (for mainline module) Bug: 202086915 Test: add test in apex_test.go and build Change-Id: Icc6619768ab006de9f86620a7df1bb2853eaba13
This commit is contained in:
committed by
Maciej Żenczykowski
parent
2a524318e4
commit
fad7f9d8b7
@@ -621,7 +621,7 @@ func TestDefaults(t *testing.T) {
|
||||
java_libs: ["myjar"],
|
||||
apps: ["AppFoo"],
|
||||
rros: ["rro"],
|
||||
bpfs: ["bpf"],
|
||||
bpfs: ["bpf", "netd_test"],
|
||||
updatable: false,
|
||||
}
|
||||
|
||||
@@ -674,6 +674,12 @@ func TestDefaults(t *testing.T) {
|
||||
srcs: ["bpf.c", "bpf2.c"],
|
||||
}
|
||||
|
||||
bpf {
|
||||
name: "netd_test",
|
||||
srcs: ["netd_test.c"],
|
||||
sub_dir: "netd",
|
||||
}
|
||||
|
||||
`)
|
||||
ensureExactContents(t, ctx, "myapex", "android_common_myapex_image", []string{
|
||||
"etc/myetc",
|
||||
@@ -683,6 +689,7 @@ func TestDefaults(t *testing.T) {
|
||||
"overlay/blue/rro.apk",
|
||||
"etc/bpf/bpf.o",
|
||||
"etc/bpf/bpf2.o",
|
||||
"etc/bpf/netd/netd_test.o",
|
||||
})
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user