diff options
| author | Taylor Hutt <thutt@chromium.org> | 2012-03-13 13:57:52 -0700 |
|---|---|---|
| committer | Taylor Hutt <thutt@chromium.org> | 2012-03-27 06:44:48 -0700 |
| commit | f5125c1848077fda08ca57322103b5795b78e307 (patch) | |
| tree | cedf63b087393954837f440b50ce70cb21c47dbe /defs | |
| parent | 83fcfb1566ab23ff4653a7b371f3c50c31c1942a (diff) | |
| download | adhd-f5125c1848077fda08ca57322103b5795b78e307.tar.gz | |
ADHD: Notify cras of hardware changes
Details
This change finally opens the cras command socket and provides
device information to cras through this socket.
cras does not yet do anything with this information.
Testing
Booted with new image, verified that the cras socket connection is
successfully opened.
Ensured that headphone switching still functions on Arm-based hardware.
Previous upload failed to build because header include paths were
incorrect, and failed to link after that because library include
paths were incorrect. Somehow I lost the changes which actually set
up the include paths; I've recreated them, and the changes to fix
some type conversion warnings which crop up when compiling in the
gavd context.
BUG=chromium-os:19558
TEST=See above
Change-Id: I736da294a0cfd3a1e994f8a8be448cf0b33c3b8c
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/c.mk | 4 | ||||
| -rw-r--r-- | defs/make.mk | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -107,7 +107,9 @@ BOARD_INCLUDE = -DADHD_BOARD_INCLUDE='"board-$(BOARD).h"' INCLUDES = \ -I$(ADHD_DIR)/include \ - -I$(ADHD_SOURCE_DIR) + -I$(ADHD_SOURCE_DIR) \ + -I$(ADHD_DIR)/cras/src/common \ + -I$(ADHD_DIR)/cras/src/libcras CFLAGS = \ -std=gnu99 \ diff --git a/defs/make.mk b/defs/make.mk index 68369d84..c9d2d257 100644 --- a/defs/make.mk +++ b/defs/make.mk @@ -17,6 +17,7 @@ endif GAVD_ARCHIVE = $(ADHD_BUILD_DIR)/lib/gavd.a LIBS = \ + -L$(ADHD_DIR)/cras/src/.libs \ $(GAVD_ARCHIVE) \ $(foreach lib,$(MY_LIBS),-l$(lib)) |