commit ca4bdf1c60e7d060aad1f1f7ed1d8a1aedba6ecc
author Alix <agespino@google.com> Tue Apr 19 22:18:33 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 19 22:18:33 2022 +0000
tree 8b255db51c12e5175c75027899deb258262c3275
parent 8a2f9151de7bdea5222d1fea61426c99fb5af8dc
parent ee940b85fe4a87918cd01596fd340457267055e5

Deleted clang property in Android.bp files am: 716f7062c9 am: 02f3dd65e8 am: ceab353cd2 am: ee940b85fe

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/data/ipacfg-mgr/+/2066709

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

ipacm/Android.bp

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

ipanat/Android.bp

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 @@
 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 @@
         "-Werror",
     ] + ["-DFEATURE_IPA_ANDROID"],
 
-    clang: true,
 }