sdm660-common: switch to blueprints where it's possible

Change-Id: I7d691f054b3744e52cb6d30b236e0a11de9923d3

folio_daemon/Android.bp

+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",
+
+}

folio_daemon/Android.mk

-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)

libshims/Android.bp

+// 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,
+}

libshims/Android.mk

-# 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)