Snap for 5143127 from 3863e3169c530642c0d39b9fa82ad5c1edf1b4d4 to qt-release

Change-Id: I691c92b3d59be49277a1a9340bceee631ab2e226
diff --git a/cras/src/Android.bp b/cras/src/Android.bp
new file mode 100644
index 0000000..46c364f
--- /dev/null
+++ b/cras/src/Android.bp
@@ -0,0 +1,29 @@
+cc_library_static {
+    name: "libcras",
+
+    srcs: [
+        "common/cras_audio_format.c",
+        "common/cras_config.c",
+        "common/cras_file_wait.c",
+        "common/cras_util.c",
+        "common/edid_utils.c",
+        "libcras/cras_client.c",
+        "libcras/cras_helpers.c",
+    ],
+
+    shared_libs: ["libtinyalsa"],
+
+    export_include_dirs: [
+        "common",
+        "libcras",
+    ],
+
+    cflags: [
+        "-DCRAS_SOCKET_FILE_DIR=\"/var/run/cras\"",
+        "-Wall",
+        "-Werror",
+        "-Wno-error=missing-field-initializers",
+        "-Wno-sign-compare",
+        "-Wno-unused-parameter",
+    ],
+}
diff --git a/cras/src/Android.mk b/cras/src/Android.mk
deleted file mode 100644
index 7856ee4..0000000
--- a/cras/src/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	common/cras_audio_format.c \
-	common/cras_config.c \
-	common/cras_file_wait.c \
-	common/cras_util.c \
-	common/edid_utils.c \
-	libcras/cras_client.c \
-	libcras/cras_helpers.c
-
-LOCAL_SHARED_LIBRARIES := \
-	libtinyalsa
-
-LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/common \
-	$(LOCAL_PATH)/libcras \
-	external/tinyalsa/include
-
-LOCAL_CFLAGS += \
-	-DCRAS_SOCKET_FILE_DIR=\"/var/run/cras\" \
-	-Wall \
-	-Werror \
-	-Wno-error=missing-field-initializers \
-	-Wno-sign-compare \
-	-Wno-unused-parameter \
-
-LOCAL_MODULE := libcras
-
-include $(BUILD_STATIC_LIBRARY)