From 95f9daa79600719fcb338a38f7de2807aeded81a Mon Sep 17 00:00:00 2001
From: Prateek Sood <prsood@codeaurora.org>
Date: Tue, 18 Feb 2020 15:29:40 +0530
Subject: headers_lib: rename Android.bp

Rename Android.bp to Androidbp. This is done to
avoid compilation failure reported for SA* targets.

Ignore tracking of Android.bp link file.

Change-Id: Ie36f8bf5e0ac011e5f82e4cbd3c2cc7d6bf14070
Signed-off-by: Prateek Sood <prsood@codeaurora.org>
Signed-off-by: Naitik Bharadiya <bharad@codeaurora.org>
[schikk@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
---
 .gitignore |  5 +++++
 Android.bp | 45 ---------------------------------------------
 Androidbp  | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 45 deletions(-)
 delete mode 100644 Android.bp
 create mode 100644 Androidbp

diff --git a/.gitignore b/.gitignore
index b17dcd217d83..fb1cf18b196e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,3 +116,8 @@ all.config
 
 # fetched Android config fragments
 android/configs/android-*.cfg
+
+#
+#Ignoring Android.bp link file
+#
+Android.bp
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 1fd921a0e88c..000000000000
--- a/Android.bp
+++ /dev/null
@@ -1,45 +0,0 @@
-cc_binary_host {
-    name: "unifdef",
-    srcs: ["scripts/unifdef.c"],
-    sanitize: {
-        never: true,
-    },
-}
-
-genrule {
-    name: "gen-headers_install.sh",
-    srcs: ["scripts/headers_install.sh"],
-    tools: ["unifdef"],
-    out: ["headers_install.sh"],
-    cmd: "sed 's+scripts/unifdef+$(location unifdef)+g' $(in) > $(out)",
-}
-
-cc_prebuilt_binary {
-    name: "headers_install.sh",
-    device_supported: false,
-    host_supported: true,
-    srcs: [":gen-headers_install.sh"],
-}
-
-// Use the following for verbose output from kernel_headers.py.
-// kernel_headers_verbose = "--verbose "
-// Use the following for minimal output from kernel_headers.py.
-kernel_headers_verbose = ""
-
-build = ["gen_headers_arm.bp", "gen_headers_arm64.bp"]
-
-cc_library_headers {
-    name: "qti_kernel_headers",
-    arch: {
-        arm: {
-            generated_headers: ["qti_generate_kernel_headers_arm"],
-            export_generated_headers: ["qti_generate_kernel_headers_arm"],
-        },
-        arm64: {
-            generated_headers: ["qti_generate_kernel_headers_arm64"],
-            export_generated_headers: ["qti_generate_kernel_headers_arm64"],
-        },
-    },
-    vendor: true,
-    recovery_available: true,
-}
diff --git a/Androidbp b/Androidbp
new file mode 100644
index 000000000000..1fd921a0e88c
--- /dev/null
+++ b/Androidbp
@@ -0,0 +1,45 @@
+cc_binary_host {
+    name: "unifdef",
+    srcs: ["scripts/unifdef.c"],
+    sanitize: {
+        never: true,
+    },
+}
+
+genrule {
+    name: "gen-headers_install.sh",
+    srcs: ["scripts/headers_install.sh"],
+    tools: ["unifdef"],
+    out: ["headers_install.sh"],
+    cmd: "sed 's+scripts/unifdef+$(location unifdef)+g' $(in) > $(out)",
+}
+
+cc_prebuilt_binary {
+    name: "headers_install.sh",
+    device_supported: false,
+    host_supported: true,
+    srcs: [":gen-headers_install.sh"],
+}
+
+// Use the following for verbose output from kernel_headers.py.
+// kernel_headers_verbose = "--verbose "
+// Use the following for minimal output from kernel_headers.py.
+kernel_headers_verbose = ""
+
+build = ["gen_headers_arm.bp", "gen_headers_arm64.bp"]
+
+cc_library_headers {
+    name: "qti_kernel_headers",
+    arch: {
+        arm: {
+            generated_headers: ["qti_generate_kernel_headers_arm"],
+            export_generated_headers: ["qti_generate_kernel_headers_arm"],
+        },
+        arm64: {
+            generated_headers: ["qti_generate_kernel_headers_arm64"],
+            export_generated_headers: ["qti_generate_kernel_headers_arm64"],
+        },
+    },
+    vendor: true,
+    recovery_available: true,
+}
-- 
cgit v1.2.3