commit d2ca788472b738a8968b189e87a8fc69acf57038
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 22 08:46:00 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 22 08:46:00 2022 +0000
tree 43bf8c81b2d8f4892c58e12bfe061f9052805ad1
parent 3fa6ee7aafd4c840168610142751c23e2bfaea6f
parent 2a7549201a74bdc6d54c8dd0557dec99cb9d1ea8

Merge "Fix linker error with upstream llvm" am: ce11dc9a2d am: 2a7549201a

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

Change-Id: Icfc754eb367de1fe69f529762c84de4d35ff5de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 19d0d5f..28edc8a 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -134,7 +134,7 @@
         "-Wthread-safety",
     ],
 
-    ldflags: ["-Wl,--exclude-libs=ALL,-error-limit=0"],
+    ldflags: ["-Wl,--exclude-libs=ALL,--error-limit=0"],
 }
 
 // Common defaults for compiling the actual APK.
@@ -231,4 +231,4 @@
     cmd: "$(location stats-log-api-gen) --java $(out) --module network_tethering" +
          " --javaPackage com.android.networkstack.tethering.metrics --javaClass TetheringStatsLog",
     out: ["com/android/networkstack/tethering/metrics/TetheringStatsLog.java"],
-}
\ No newline at end of file
+}