commit 7645571a9e8dd6db9f78d6cda87e6ff192879d28
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 03 07:37:35 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 03 07:37:35 2022 +0000
tree e5a1b0f59f7e1e484b61f59a588f4bba10ee2718
parent c7975ff3bf39ca428d69f6bf3016b505f6f4a054
parent d72a5a7a7007e8b0004bb9d2c82ffed52659ddf2

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

Tethering/apex/Android.bp

diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index bd8fe7c..76c5d5c 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -70,9 +70,9 @@
     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",
     ],

bpf_progs/Android.bp

diff --git a/bpf_progs/Android.bp b/bpf_progs/Android.bp
index 1fe0e9a..0e7b22d 100644
--- a/bpf_progs/Android.bp
+++ b/bpf_progs/Android.bp
@@ -97,7 +97,7 @@
 }
 
 bpf {
-    name: "clatd.o_mainline",
+    name: "clatd.o",
     srcs: ["clatd.c"],
     cflags: [
         "-Wall",
@@ -110,7 +110,7 @@
 }
 
 bpf {
-    name: "netd.o_mainline",
+    name: "netd.o",
     srcs: ["netd.c"],
     cflags: [
         "-Wall",