From bcef77874c94deeb4f2cd576f6289bdce35efa04 Mon Sep 17 00:00:00 2001
From: Rashed Abdel-Tawab <rashed@linux.com>
Date: Sun, 29 Sep 2019 15:37:38 -0400
Subject: [PATCH] walleye: Switch to generated_kernel_headers

This is a squash of the following:

Author: LuK1337 <priv.luk@gmail.com>
Date:   Sun Sep 27 16:12:10 2020 +0200

    wahoo: gpt-utils: Drop unnecessary include

    * When using generated_kernel_headers including
      stdio.h will cause errors due to redefined macros.

    Change-Id: I2f753a64f760b636be1325873e17697466fbf33d

Author: LuK1337 <priv.luk@gmail.com>
Date:   Mon Sep 9 22:38:02 2019 +0200

    wahoo: gpt-utils: Drop unnecessary include

    * When using generated_kernel_headers including
      asm/byteorder.h will cause a warning due to
      unused static functions.

    Change-Id: I2a74ec92487c13c4645048c96da8cb92b3cbd9f0

Author: Rashed Abdel-Tawab <rashed@linux.com>
Date:   Sun Sep 29 15:37:38 2019 -0400

    wahoo: Switch gpt-utils to generated_kernel_headers

    Change-Id: Ia6e2f7e140e6ffbd3a93dd823f836aaf399d03fb

Change-Id: Ia1f608778b5b37fec770abbf185c5e313cd5ba16
---
 gpt-utils/Android.bp    | 2 +-
 gpt-utils/gpt-utils.cpp | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp
index 8a8301c..c0596d1 100644
--- a/gpt-utils/Android.bp
+++ b/gpt-utils/Android.bp
@@ -32,7 +32,7 @@ cc_library {
     ],
     owner: "qti",
     header_libs: [
-        "device_kernel_headers",
+        "generated_kernel_headers",
     ],
     export_include_dirs: ["."],
 }
diff --git a/gpt-utils/gpt-utils.cpp b/gpt-utils/gpt-utils.cpp
index 7f04f42..ec1d4bb 100644
--- a/gpt-utils/gpt-utils.cpp
+++ b/gpt-utils/gpt-utils.cpp
@@ -32,7 +32,6 @@
 /******************************************************************************
  * INCLUDE SECTION
  ******************************************************************************/
-#include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
@@ -46,7 +45,6 @@
 #include <dirent.h>
 #include <inttypes.h>
 #include <linux/kernel.h>
-#include <asm/byteorder.h>
 #include <map>
 #include <vector>
 #include <string>