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

2 files changed, 33 insertions, 28 deletions

diff --git a/iotop/Android.bp b/iotop/Android.bp
new file mode 100644
index 00000000..9b5e40cc
--- /dev/null
+++ b/iotop/Android.bp
@@ -0,0 +1,33 @@
+// Copyright (C) 2015 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_binary {
+    name: "iotop",
+
+    srcs: [
+        "iotop.cpp",
+        "tasklist.cpp",
+        "taskstats.cpp",
+    ],
+
+    shared_libs: [
+        "libnl",
+        "libbase",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+}
diff --git a/iotop/Android.mk b/iotop/Android.mk
deleted file mode 100644
index b8a146df..00000000
--- a/iotop/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2015 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.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := iotop.cpp tasklist.cpp taskstats.cpp
-
-LOCAL_MODULE := iotop
-
-LOCAL_MODULE_TAGS := debug
-
-LOCAL_SHARED_LIBRARIES := libnl libbase
-
-LOCAL_CFLAGS := -Wall -Werror
-
-include $(BUILD_EXECUTABLE)