From b239211314f3080767e9175d20294b90eb7e3053 Mon Sep 17 00:00:00 2001
From: Alix <agespino@google.com>
Date: Thu, 21 Apr 2022 02:59:29 +0000
Subject: Moved contents of clang_cflags into cflags

Test: Treehugger
Bug: 226636335
Change-Id: I80bb8d9c3382805b60b292b8064786746c8c1e8a
---
 pppd/Android.bp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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 @@ filegroup {
         "tty.c",
         "upap.c",
         "utils.c",
-    ]
+    ],
 }
 
 cc_library_static {
@@ -99,14 +99,16 @@ cc_library_static {
     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 @@ cc_library_static {
         "-Wno-empty-body",
         "-Wno-attributes",
         "-Wno-sign-compare",
+        "-Wno-incompatible-pointer-types-discards-qualifiers",
     ],
 
     ldflags: ["-rdynamic"],
@@ -134,7 +137,7 @@ cc_binary {
     defaults: ["ppp_defaults"],
 
     srcs: [
-        ":pppd-sources"
+        ":pppd-sources",
     ],
 
     shared_libs: [
@@ -146,7 +149,7 @@ cc_binary {
 
     ldflags: ["-rdynamic"],
 
-    clang_cflags: ["-Wno-incompatible-pointer-types-discards-qualifiers"],
+    cflags: ["-Wno-incompatible-pointer-types-discards-qualifiers"],
 
     required: [
         "pppol2tp-android",
-- 
cgit v1.2.3