Merge "Moved contents of clang_cflags into cflags" am: 076405b337 am: 08f15a5982 am: d1ce7d47e3 am: ac62155851 am: 85f8607741android-t-qpr3-beta-3-gplandroid-t-qpr3-beta-1-gplandroid-t-qpr2-beta-3-gplandroid-t-qpr2-beta-2-gplandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release

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>

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