commit c88566d7be6abc37ede127d66264d7d2b8865c45
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 21 07:47:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 21 07:47:11 2022 +0000
tree 50f5d75a7e782604d8f6161e732de907703f3088
parent 0682219208d494e40bb39aac6df651379f76f30e
parent 85f860774137fe6fe00e2586f7f44df6d5fc6cb0

Merge "Moved contents of clang_cflags into cflags" am: 076405b337 am: 08f15a5982 am: d1ce7d47e3 am: ac62155851 am: 85f8607741

Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2069496

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

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",