commit f7ab0ac0a7124c9dc2e00a175354e04b00b39464
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 22 03:04:44 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 22 03:04:44 2022 +0000
tree 50f5d75a7e782604d8f6161e732de907703f3088
parent 0682219208d494e40bb39aac6df651379f76f30e
parent c88566d7be6abc37ede127d66264d7d2b8865c45

Snap for 8485725 from c88566d7be6abc37ede127d66264d7d2b8865c45 to tm-qpr1-release

Change-Id: Ib994754993282494aea39ea63490a5fbffa39b77

pppd/Android.bp

diff --git a/pppd/Android.bp b/pppd/Android.bp
index dfa36bd..43e5688 100644
--- a/pppd/Android.bp
+++ b/pppd/Android.bp
@@ -91,7 +91,7 @@
         "tty.c",
         "upap.c",
         "utils.c",
-    ]
+    ],
 }
 
 cc_library_static {
@@ -99,14 +99,16 @@
     defaults: ["ppp_defaults"],
 
     srcs: [
-        ":pppd-sources"
+        ":pppd-sources",
     ],
-    export_include_dirs:[".", "include"],
+    export_include_dirs: [
+        ".",
+        "include",
+    ],
 
     // options.c:623:21: error: passing 'const char *' to parameter of
     // type 'char *' discards qualifiers.
     // [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
-    clang_cflags: ["-Wno-incompatible-pointer-types-discards-qualifiers"],
 
     shared_libs: [
         "libdl",
@@ -120,6 +122,7 @@
         "-Wno-empty-body",
         "-Wno-attributes",
         "-Wno-sign-compare",
+        "-Wno-incompatible-pointer-types-discards-qualifiers",
     ],
 
     ldflags: ["-rdynamic"],
@@ -134,7 +137,7 @@
     defaults: ["ppp_defaults"],
 
     srcs: [
-        ":pppd-sources"
+        ":pppd-sources",
     ],
 
     shared_libs: [
@@ -146,7 +149,7 @@
 
     ldflags: ["-rdynamic"],
 
-    clang_cflags: ["-Wno-incompatible-pointer-types-discards-qualifiers"],
+    cflags: ["-Wno-incompatible-pointer-types-discards-qualifiers"],
 
     required: [
         "pppol2tp-android",