Merge "remove _mainline suffix from {clatd,netd}.o_mainline targets"

2022-05-03 07:37:35 +00:00
parent c7975ff3bf d72a5a7a70
commit 7645571a9e
2 changed files with 4 additions and 4 deletions
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -70,9 +70,9 @@ apex {
    canned_fs_config: "canned_fs_config",
    bpfs: [
        "block.o",
-        "clatd.o_mainline",
+        "clatd.o",
        "dscp_policy.o",
-        "netd.o_mainline",
+        "netd.o",
        "offload.o",
        "test.o",
    ],
--- a/bpf_progs/Android.bp
+++ b/bpf_progs/Android.bp
@@ -97,7 +97,7 @@ bpf {
 }

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

 bpf {
-    name: "netd.o_mainline",
+    name: "netd.o",
    srcs: ["netd.c"],
    cflags: [
        "-Wall",