Merge "remove _mainline suffix from {clatd,netd}.o_mainline targets" am: 7645571a9e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2084168

Change-Id: Id75bd5c0f07e5c259dfc8753ae7529bc8b4932f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-05-03 08:45:01 +00:00
committed by Automerger Merge Worker
2 changed files with 4 additions and 4 deletions

View File

@@ -70,9 +70,9 @@ apex {
canned_fs_config: "canned_fs_config", canned_fs_config: "canned_fs_config",
bpfs: [ bpfs: [
"block.o", "block.o",
"clatd.o_mainline", "clatd.o",
"dscp_policy.o", "dscp_policy.o",
"netd.o_mainline", "netd.o",
"offload.o", "offload.o",
"test.o", "test.o",
], ],

View File

@@ -97,7 +97,7 @@ bpf {
} }
bpf { bpf {
name: "clatd.o_mainline", name: "clatd.o",
srcs: ["clatd.c"], srcs: ["clatd.c"],
cflags: [ cflags: [
"-Wall", "-Wall",
@@ -110,7 +110,7 @@ bpf {
} }
bpf { bpf {
name: "netd.o_mainline", name: "netd.o",
srcs: ["netd.c"], srcs: ["netd.c"],
cflags: [ cflags: [
"-Wall", "-Wall",