summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-11-20 15:13:38 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-11-20 15:13:38 -0800
commit0229730aee88a54b66046513ba66c64e626ba106 (patch)
treea030cf5283f99040d672053de00f2f8be432dcd5
parent0702ba2786f5bedc375b9b7c8120d212c02c08f6 (diff)
parent586963766cb75bd08cf558889e1dcae8a40b4727 (diff)
downloadadhd-0229730aee88a54b66046513ba66c64e626ba106.tar.gz
Convert libcras to Android.bp
am: 586963766c Change-Id: I4620569eec32cd205ab99f07d7d16ce23a1001b9
-rw-r--r--cras/src/Android.bp29
-rw-r--r--cras/src/Android.mk32
2 files changed, 29 insertions, 32 deletions
diff --git a/cras/src/Android.bp b/cras/src/Android.bp
new file mode 100644
index 00000000..46c364f1
--- /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 7856ee4c..00000000
--- 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)