From 2a904afcb32568d3c33d56971c7b1783e265c8d5 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 4 May 2018 18:35:50 -0700
Subject: Convert to Soong

See build/soong/README.md for more information.

This effectively moves some of these targets from /system/xbin to
/system/bin, as Soong is not supporting xbin. I've attempted to fix and
find any external dependencies to these paths.

Test: m anrd app-launcher bootctrl.default bootctl cpustats crypto iotop
Change-Id: I3eb58d8a260884652b5ee827ac88ece429d76448
---
 boot_control_copy/Android.bp | 26 ++++++++++++++++++++++++++
 boot_control_copy/Android.mk | 14 --------------
 2 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 boot_control_copy/Android.bp
 delete mode 100644 boot_control_copy/Android.mk

(limited to 'boot_control_copy')

diff --git a/boot_control_copy/Android.bp b/boot_control_copy/Android.bp
new file mode 100644
index 00000000..97d89c86
--- /dev/null
+++ b/boot_control_copy/Android.bp
@@ -0,0 +1,26 @@
+// Copyright 2015 The Android Open Source Project
+
+cc_library_shared {
+    name: "bootctrl.default",
+    relative_install_path: "hw",
+
+    srcs: [
+        "boot_control_copy.cpp",
+        "bootinfo.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-missing-field-initializers",
+        "-Wno-unused-parameter",
+    ],
+    header_libs: ["bootimg_headers"],
+    shared_libs: [
+        "libbase",
+        "libcutils",
+    ],
+    static_libs: [
+        "libbootloader_message",
+        "libfs_mgr",
+    ],
+}
diff --git a/boot_control_copy/Android.mk b/boot_control_copy/Android.mk
deleted file mode 100644
index 8ed3273f..00000000
--- a/boot_control_copy/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2015 The Android Open Source Project
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := boot_control_copy.cpp bootinfo.cpp
-LOCAL_CFLAGS := -Wall -Werror -Wno-missing-field-initializers -Wno-unused-parameter
-LOCAL_HEADER_LIBRARIES := bootimg_headers
-LOCAL_SHARED_LIBRARIES := libbase libcutils
-LOCAL_STATIC_LIBRARIES := libbootloader_message libfs_mgr
-
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_MODULE:= bootctrl.default
-include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3