Convert more of system/extras to Soong

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

Some modules are no longer installed by default on eng/debug builds, but
I didn't see any automatic references to them. If they're commonly used
by users, they can be added into build/make with PRODUCT_PACKAGES_ENG /
PRODUCT_PACKAGES_DEBUG. Otherwise everyone's compiles get a little
smaller.

Some modules also moved from /system/xbin to /system/bin, as we've
deprecated xbin. I checked codesearch for references to the full paths
and couldn't find any.

Test: cd system/extras; mma
Test: for the modules changing locations, check cs/ for references
Change-Id: I4ffd99d3dcf50e4d5cb2197824abc11973214133

2 files changed, 53 insertions, 58 deletions

diff --git a/memtrack/Android.bp b/memtrack/Android.bp
new file mode 100644
index 00000000..3f445b71
--- /dev/null
+++ b/memtrack/Android.bp
@@ -0,0 +1,53 @@
+// Copyright (C) 2013 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_defaults {
+    name: "memtrack_defaults",
+
+    srcs: ["memtrack.cpp"],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-error=unused-value",
+    ],
+}
+
+cc_binary {
+    name: "memtrack_share",
+    defaults: ["memtrack_defaults"],
+
+    shared_libs: ["liblog"],
+}
+
+cc_binary {
+    name: "memtrack",
+    defaults: ["memtrack_defaults"],
+
+    static_executable: true,
+    static_libs: [
+        "libc",
+        "liblog",
+        "libc++abi",
+        "libdl",
+    ],
+
+    stl: "libc++_static",
+
+    // Bug: 18389563 - Today, libc++_static and libgcc have duplicate sybols for
+    // __aeabi_uidiv(). Allowing multiple definitions lets the build proceed, but
+    // updating compiler-rt to be a superset of libgcc will allow this WAR to be
+    // removed.
+    ldflags: ["-Wl,-z,muldefs"],
+}
diff --git a/memtrack/Android.mk b/memtrack/Android.mk
deleted file mode 100644
index cd99b6cc..00000000
--- a/memtrack/Android.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (C) 2013 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)
-
-src_files := \
-    memtrack.cpp
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_SRC_FILES := $(src_files)
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_MODULE := memtrack_share
-LOCAL_CFLAGS := -Wall -Werror -Wno-error=unused-value
-
-LOCAL_C_INCLUDES += $(includes)
-LOCAL_SHARED_LIBRARIES := \
-    liblog \
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_SRC_FILES := $(src_files)
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_MODULE := memtrack
-LOCAL_CFLAGS := -Wall -Werror -Wno-error=unused-value
-
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-LOCAL_STATIC_LIBRARIES := \
-    libc \
-    liblog \
-    libc++abi \
-    libdl \
-
-LOCAL_CXX_STL := libc++_static
-
-# Bug: 18389563 - Today, libc++_static and libgcc have duplicate sybols for
-# __aeabi_uidiv(). Allowing multiple definitions lets the build proceed, but
-# updating compiler-rt to be a superset of libgcc will allow this WAR to be
-# removed.
-LOCAL_LDFLAGS := -Wl,-z,muldefs
-
-include $(BUILD_EXECUTABLE)