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, 33 insertions, 30 deletions

diff --git a/micro_bench/Android.bp b/micro_bench/Android.bp
new file mode 100644
index 00000000..ba9db53b
--- /dev/null
+++ b/micro_bench/Android.bp
@@ -0,0 +1,33 @@
+cc_defaults {
+    name: "micro_bench_defaults",
+    srcs: ["micro_bench.cpp"],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-error=unused-variable",
+    ],
+
+    compile_multilib: "both",
+    multilib: {
+        lib64: {
+            suffix: "64",
+        },
+    },
+}
+
+cc_binary {
+    name: "micro_bench",
+    defaults: ["micro_bench_defaults"],
+}
+
+cc_binary {
+    name: "micro_bench_static",
+    defaults: ["micro_bench_defaults"],
+
+    static_libs: [
+        "libc",
+        "libm",
+    ],
+    static_executable: true,
+}
diff --git a/micro_bench/Android.mk b/micro_bench/Android.mk
deleted file mode 100644
index 843a2e5e..00000000
--- a/micro_bench/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := micro_bench.cpp
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_MODULE_TAGS := debug
-LOCAL_MODULE := micro_bench
-LOCAL_CFLAGS := -Wall -Werror -Wno-error=unused-variable
-
-LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := micro_bench.cpp
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_MODULE_TAGS := debug
-LOCAL_MODULE := micro_bench_static
-LOCAL_CFLAGS := -Wall -Werror -Wno-error=unused-variable
-LOCAL_STATIC_LIBRARIES = libc libm
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-
-LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-include $(BUILD_EXECUTABLE)