diff options
| author | Alix <agespino@google.com> | 2022-04-19 21:03:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-19 21:03:42 +0000 |
| commit | 02f3dd65e8a304f11fc685f8f3233d40b8c6edca (patch) | |
| tree | a652d01c5169a0c3f7425cd7104cfa7074c1b497 | |
| parent | 360f94c961de1f7766d6f9dbb6abe7f8e9101f1d (diff) | |
| parent | 716f7062c9145957431e153bd161f8617941d098 (diff) | |
| download | ipacfg-mgr-02f3dd65e8a304f11fc685f8f3233d40b8c6edca.tar.gz | |
Deleted clang property in Android.bp files am: 716f7062c9
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/data/ipacfg-mgr/+/2066709
Change-Id: I5dd14559769d239ac21316e963692c718e17633a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | ipacm/Android.bp | 19 | ||||
| -rw-r--r-- | ipanat/Android.bp | 7 |
2 files changed, 12 insertions, 14 deletions
diff --git a/ipacm/Android.bp b/ipacm/Android.bp index 6662fce..91ad133 100644 --- a/ipacm/Android.bp +++ b/ipacm/Android.bp @@ -1,4 +1,3 @@ - package { // http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import @@ -16,12 +15,12 @@ cc_binary { header_libs: ["device_kernel_headers"], cflags: ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [ "-DFEATURE_IPACM_HAL", - "-DDEBUG", + "-DDEBUG", "-Wall", "-Werror", "-Wno-error=macro-redefined", - "-Wno-enum-compare", - "-Wno-error=implicit-fallthrough", + "-Wno-enum-compare", + "-Wno-error=implicit-fallthrough", ], srcs: [ @@ -49,15 +48,15 @@ cc_binary { ], init_rc: ["src/ipacm.rc"], - clang: true, + vendor: true, shared_libs: [ - "liboffloadhal", - "libipanat", - "libxml2", - "libnfnetlink", - "libnetfilter_conntrack", + "liboffloadhal", + "libipanat", + "libxml2", + "libnfnetlink", + "libnetfilter_conntrack", "libhidlbase", "liblog", "libcutils", diff --git a/ipanat/Android.bp b/ipanat/Android.bp index 72ec1a8..50ca58e 100644 --- a/ipanat/Android.bp +++ b/ipanat/Android.bp @@ -13,15 +13,15 @@ package { cc_library_shared { name: "libipanat", - header_libs: ["device_kernel_headers"], + header_libs: ["device_kernel_headers"], srcs: [ "src/ipa_nat_drv.c", "src/ipa_nat_drvi.c", ], - shared_libs: - ["libcutils", + shared_libs: [ + "libcutils", "libdl", "libbase", "libutils", @@ -34,5 +34,4 @@ cc_library_shared { "-Werror", ] + ["-DFEATURE_IPA_ANDROID"], - clang: true, } |