summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorCheng-Yi Chiang <cychiang@chromium.org>2015-01-07 08:37:54 -0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-01-07 18:44:37 +0000
commit06a16ad51235ad9fbe2d45540880e778e94c35e4 (patch)
tree5aeb4eb7455ade553dfd54635008fdc1d1ae181f /Makefile
parentb72619aef145c56c24ebc467918f574be74e0377 (diff)
downloadadhd-06a16ad51235ad9fbe2d45540880e778e94c35e4.tar.gz
Remove cras-config-files in Makefile
Install cras-config files in ebuild rather than Makefile. Align the install steps of cras-config and ucm-config, and will let variant board install cras-config using non-variant board if variant board does not have its own cras-config. CQ-DEPEND=CL:239035 BUG=chromium:446360 TEST=With change in ebuild, emerge-link_freon adhd, check /build/link_freon/etc/cras/HDA Intel PCH is installed. Change-Id: I190dbdd3ad19be519a8063f97a8744c00b3e053d Signed-off-by: Cheng-Yi Chiang <cychiang@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/239047 Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 0 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 14b5261d..0740fdb6 100644
--- a/Makefile
+++ b/Makefile
@@ -66,20 +66,6 @@ install: $(DESTDIR)/lib/firmware/$(BOARD)_alsa.fw
endif
-optional_cras_conf := $(wildcard $(ADHD_DIR)/cras-config/$(BOARD)/*)
-
-ifneq ($(strip $(optional_cras_conf)),)
-
-.PHONY: cras-config-files
-cras-config-files:
- $(ECHO) "Installing cras config files"
- $(INSTALL) --mode 755 -d $(DESTDIR)etc/cras/
- $(INSTALL) --mode 644 -D $(ADHD_DIR)/cras-config/$(BOARD)/* $(DESTDIR)etc/cras/
-
-install: cras-config-files
-
-endif
-
install: $(DESTDIR)/etc/init/cras.conf \
$(DESTDIR)/etc/asound.state \
$(DESTDIR)/etc/cras/device_blacklist \