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, 65 insertions, 82 deletions

diff --git a/memory_replay/Android.bp b/memory_replay/Android.bp
new file mode 100644
index 00000000..824ac125
--- /dev/null
+++ b/memory_replay/Android.bp
@@ -0,0 +1,65 @@
+cc_defaults {
+    name: "memory_replay_defaults",
+    host_supported: true,
+
+    srcs: [
+        "Action.cpp",
+        "LineBuffer.cpp",
+        "NativeInfo.cpp",
+        "Pointers.cpp",
+        "Thread.cpp",
+        "Threads.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ],
+    shared_libs: ["libbase"],
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
+
+}
+
+cc_binary {
+    name: "memory_replay",
+    defaults: ["memory_replay_defaults"],
+
+    srcs: ["main.cpp"],
+}
+
+cc_test {
+    name: "memory_replay_tests",
+    defaults: ["memory_replay_defaults"],
+
+    srcs: [
+        "tests/ActionTest.cpp",
+        "tests/LineBufferTest.cpp",
+        "tests/NativeInfoTest.cpp",
+        "tests/PointersTest.cpp",
+        "tests/ThreadTest.cpp",
+        "tests/ThreadsTest.cpp",
+    ],
+
+    local_include_dirs: ["tests"],
+
+    target: {
+        android: {
+            test_suites: ["device-tests"],
+        },
+    },
+}
diff --git a/memory_replay/Android.mk b/memory_replay/Android.mk
deleted file mode 100644
index b72f0061..00000000
--- a/memory_replay/Android.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-memory_replay_src_files := \
-	Action.cpp \
-	LineBuffer.cpp \
-	NativeInfo.cpp \
-	Pointers.cpp \
-	Thread.cpp \
-	Threads.cpp \
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(memory_replay_src_files) main.cpp
-LOCAL_CFLAGS := -Wall -Wextra -Werror
-LOCAL_MODULE_TAGS := debug
-LOCAL_MODULE := memory_replay
-LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-LOCAL_SHARED_LIBRARIES := libbase
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(memory_replay_src_files) main.cpp
-LOCAL_CFLAGS := -Wall -Wextra -Werror
-LOCAL_MODULE_TAGS := debug
-LOCAL_MODULE := memory_replay
-LOCAL_MODULE_HOST_OS := linux
-LOCAL_LDLIBS := -lrt
-LOCAL_SHARED_LIBRARIES := libbase
-include $(BUILD_HOST_EXECUTABLE)
-
-memory_replay_test_src_files := \
-	tests/ActionTest.cpp \
-	tests/LineBufferTest.cpp \
-	tests/NativeInfoTest.cpp \
-	tests/PointersTest.cpp \
-	tests/ThreadTest.cpp \
-	tests/ThreadsTest.cpp \
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	$(memory_replay_src_files) \
-	$(memory_replay_test_src_files) \
-
-LOCAL_CFLAGS := -Wall -Wextra -Werror
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/tests
-LOCAL_MODULE_TAGS := debug
-LOCAL_MODULE := memory_replay_tests
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-LOCAL_SHARED_LIBRARIES := libbase
-
-LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-include $(BUILD_NATIVE_TEST)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	$(memory_replay_src_files) \
-	$(memory_replay_test_src_files) \
-
-LOCAL_CFLAGS := -Wall -Wextra -Werror
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/tests
-LOCAL_MODULE_TAGS := debug
-LOCAL_MODULE := memory_replay_tests
-LOCAL_MODULE_HOST_OS := linux
-
-LOCAL_SHARED_LIBRARIES := libbase
-LOCAL_LDLIBS := -lrt
-
-LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-include $(BUILD_HOST_NATIVE_TEST)
-
-memory_replay_src_files :=
-memory_replay_test_src_files :=