From d83ed40ebd975715a21968604e1804acd151fe8c Mon Sep 17 00:00:00 2001
From: Hridya Valsaraju <hridya@google.com>
Date: Mon, 20 Aug 2018 16:31:22 -0700
Subject: [PATCH] sdm845-common: Build libgptutils with Android.bp

This is required to build bootctrl.sdm845 with Android.bp.

Bug: 78793464
Test: make

Change-Id: Iff4f50ad363cc003d60a5380addd79749b547514
---
 common.mk            |  2 +-
 gpt-utils/Android.bp | 39 +++++++++++++++++++++++++++++++++++++++
 gpt-utils/Android.mk | 23 -----------------------
 3 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 gpt-utils/Android.bp
 delete mode 100644 gpt-utils/Android.mk

diff --git a/common.mk b/common.mk
index 39d4ed3..dba7889 100644
--- a/common.mk
+++ b/common.mk
@@ -148,7 +148,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_STATIC_BOOT_CONTROL_HAL := \
     bootctrl.sdm845 \
     libcutils \
-    libgptutils \
+    libgptutils.oneplus_sdm845.recovery \
     libz \
 
 PRODUCT_PACKAGES_DEBUG += \
diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp
new file mode 100644
index 0000000..204dde1
--- /dev/null
+++ b/gpt-utils/Android.bp
@@ -0,0 +1,39 @@
+//
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+cc_library {
+    name: "libgptutils.oneplus_sdm845",
+    vendor: true,
+    recovery_available: true,
+    shared_libs: [
+        "libcutils",
+        "liblog",
+        "libz",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+    srcs: [
+        "gpt-utils.cpp",
+    ],
+    owner: "qti",
+    header_libs: [
+        "device_kernel_headers",
+    ],
+    export_include_dirs: ["."],
+}
diff --git a/gpt-utils/Android.mk b/gpt-utils/Android.mk
deleted file mode 100644
index 9fde983..0000000
--- a/gpt-utils/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := bootable/recovery \
-		    $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_SRC_FILES := gpt-utils.cpp sparse_crc32.cpp
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-LOCAL_MODULE := libgptutils
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := bootable/recovery \
-		    $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_SRC_FILES := gpt-utils.cpp sparse_crc32.cpp
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-LOCAL_SHARED_LIBRARIES += liblog libcutils
-LOCAL_MODULE := libgptutils
-LOCAL_COPY_HEADERS_TO := gpt-utils/inc
-LOCAL_COPY_HEADERS := gpt-utils.h
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_SHARED_LIBRARY)