From 8376ecf8315b498e870c831c02f09ad50f3086dd Mon Sep 17 00:00:00 2001
From: Stylogey <stylogey@gmail.com>
Date: Mon, 4 May 2020 21:16:13 +0200
Subject: [PATCH] sdm660-common: switch to blueprints where it's possible

Change-Id: I7d691f054b3744e52cb6d30b236e0a11de9923d3
---
 folio_daemon/Android.bp | 21 +++++++++++++++++++++
 folio_daemon/Android.mk | 22 ----------------------
 libshims/Android.bp     | 24 ++++++++++++++++++++++++
 libshims/Android.mk     | 23 -----------------------
 4 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100755 folio_daemon/Android.bp
 delete mode 100755 folio_daemon/Android.mk
 create mode 100644 libshims/Android.bp
 delete mode 100644 libshims/Android.mk

diff --git a/folio_daemon/Android.bp b/folio_daemon/Android.bp
new file mode 100755
index 00000000..c609cfb1
--- /dev/null
+++ b/folio_daemon/Android.bp
@@ -0,0 +1,21 @@
+cc_binary {
+    name: "folio_daemon",
+
+    shared_libs: [
+        "libandroid",
+        "libcutils",
+        "liblog",
+    ],
+
+    srcs: ["main.cpp"],
+
+    cflags: [
+        "-DLOG_TAG=\"folio_daemon\"",
+        "-DLOG_NDEBUG=0",
+        "-Wall",
+        "-Werror",
+    ],
+
+    owner: "google",
+
+}
diff --git a/folio_daemon/Android.mk b/folio_daemon/Android.mk
deleted file mode 100755
index d2787c06..00000000
--- a/folio_daemon/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SHARED_LIBRARIES := \
-    libandroid \
-    libcutils \
-    liblog
-
-LOCAL_SRC_FILES := \
-    main.cpp
-
-LOCAL_C_INCLUDES :=
-
-LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"folio_daemon\" -DLOG_NDEBUG=0
-
-LOCAL_CFLAGS += -Wall -Werror
-
-LOCAL_MODULE := folio_daemon
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := google
-
-include $(BUILD_EXECUTABLE)
diff --git a/libshims/Android.bp b/libshims/Android.bp
new file mode 100644
index 00000000..ed661039
--- /dev/null
+++ b/libshims/Android.bp
@@ -0,0 +1,24 @@
+// Copyright (C) 2018 The LineageOS 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_shared {
+    name: "camera.sdm660_shim",
+    srcs: ["camera_sdm660_shim.cpp"],
+    shared_libs: [
+        "libui",
+        "libutils",
+    ],
+
+    proprietary: true,
+}
diff --git a/libshims/Android.mk b/libshims/Android.mk
deleted file mode 100644
index fcc5acc7..00000000
--- a/libshims/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2018 The LineageOS 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.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := camera_sdm660_shim.cpp
-LOCAL_SHARED_LIBRARIES := libui libutils
-LOCAL_MODULE := camera.sdm660_shim
-LOCAL_MODULE_TAGS := optional
-LOCAL_PROPRIETARY_MODULE := true
-include $(BUILD_SHARED_LIBRARY)