diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-21 07:21:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-21 07:21:58 +0000 |
| commit | 3a39a7d1f1257f433e32d170124188d0a173e0fb (patch) | |
| tree | 50f5d75a7e782604d8f6161e732de907703f3088 | |
| parent | 0682219208d494e40bb39aac6df651379f76f30e (diff) | |
| parent | ac62155851807c9f004bb567d0664e8bccb02fa6 (diff) | |
| download | ppp-android13-mainline-tzdata4-release.tar.gz | |
Merge "Moved contents of clang_cflags into cflags" am: 076405b337 am: 08f15a5982 am: d1ce7d47e3 am: ac62155851aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2069496
Change-Id: I675d52bb96e4d1310c442cb6754278ffbc324d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | pppd/Android.bp | 15 |
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", |