Project import generated by Copybara.
GitOrigin-RevId: 445f158555c9bc3683e6b9d02c4b00032b072a1b
diff --git a/README.google b/README.google
new file mode 100644
index 0000000..b0e3007
--- /dev/null
+++ b/README.google
@@ -0,0 +1,4 @@
+Mitigated: CVE-2019-13351
+alsa-plugins 1.0.29 predates the intro of the bug in commit f47466. This
+message needs to be included in the alsa-lib repository due to how the
+automatic vulnerability scanner works.
diff --git a/src/Android.mk b/src/Android.mk
index b201cb2..2e047be 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -85,17 +85,101 @@
include $(CLEAR_VARS)
SOURCE_ALSA_CONF_PATH := $(ALSA_PATH)/conf
-LOCAL_MODULE :=alsa-conf
+LOCAL_MODULE := alsa-conf
LOCAL_MODULE_TAGS := optional
LOCAL_REQUIRED_MODULES := acp
TARGET_ALSA_CONF_PATH := $(TARGET_OUT)/usr/share/alsa
include $(BUILD_PHONY_PACKAGE)
-.PHONY: copy_alsa_conf
-copy_alsa_conf:
- mkdir -p $(TARGET_ALSA_CONF_PATH)
- rsync -a $(SOURCE_ALSA_CONF_PATH)/alsa.conf $(TARGET_ALSA_CONF_PATH)
- rsync -a $(SOURCE_ALSA_CONF_PATH)/cards $(TARGET_ALSA_CONF_PATH)
- rsync -a $(SOURCE_ALSA_CONF_PATH)/pcm $(TARGET_ALSA_CONF_PATH)
+ALSA_CONF_FILES := \
+ cards/AACI.conf \
+ cards/aliases.alisp \
+ cards/aliases.conf \
+ cards/ATIIXP.conf \
+ cards/ATIIXP-MODEM.conf \
+ cards/ATIIXP-SPDMA.conf \
+ cards/AU8810.conf \
+ cards/AU8820.conf \
+ cards/AU8830.conf \
+ cards/Audigy2.conf \
+ cards/Audigy.conf \
+ cards/Aureon51.conf \
+ cards/Aureon71.conf \
+ cards/CA0106.conf \
+ cards/CMI8338.conf \
+ cards/CMI8338-SWIEC.conf \
+ cards/CMI8738-MC6.conf \
+ cards/CMI8738-MC8.conf \
+ cards/CMI8788.conf \
+ cards/CS46xx.conf \
+ cards/Echo_Echo3G.conf \
+ cards/EMU10K1.conf \
+ cards/EMU10K1X.conf \
+ cards/ENS1370.conf \
+ cards/ENS1371.conf \
+ cards/ES1968.conf \
+ cards/FireWave.conf \
+ cards/FM801.conf \
+ cards/FWSpeakers.conf \
+ cards/GUS.conf \
+ cards/HDA-Intel.conf \
+ cards/ICE1712.conf \
+ cards/ICE1724.conf \
+ cards/ICH4.conf \
+ cards/ICH.conf \
+ cards/ICH-MODEM.conf \
+ cards/Loopback.conf \
+ cards/Maestro3.conf \
+ cards/Makefile.am \
+ cards/Makefile.in \
+ cards/NFORCE.conf \
+ cards/PC-Speaker.conf \
+ cards/PMac.conf \
+ cards/PMacToonie.conf \
+ cards/PS3.conf \
+ cards/RME9636.conf \
+ cards/RME9652.conf \
+ cards/SB-XFi.conf \
+ cards/SI7018 \
+ cards/SI7018.conf \
+ cards/TRID4DWAVENX.conf \
+ cards/USB-Audio.conf \
+ cards/VIA686A.conf \
+ cards/VIA8233A.conf \
+ cards/VIA8233.conf \
+ cards/VIA8237.conf \
+ cards/VX222.conf \
+ cards/VXPocket440.conf \
+ cards/VXPocket.conf \
+ cards/YMF744.conf \
+ cards/SI7018/sndoc-mixer.alisp \
+ cards/SI7018/sndop-mixer.alisp \
+ pcm/center_lfe.conf \
+ pcm/default.conf \
+ pcm/dmix.conf \
+ pcm/dpl.conf \
+ pcm/dsnoop.conf \
+ pcm/front.conf \
+ pcm/hdmi.conf \
+ pcm/iec958.conf \
+ pcm/Makefile.am \
+ pcm/Makefile.in \
+ pcm/modem.conf \
+ pcm/rear.conf \
+ pcm/side.conf \
+ pcm/surround21.conf \
+ pcm/surround40.conf \
+ pcm/surround41.conf \
+ pcm/surround50.conf \
+ pcm/surround51.conf \
+ pcm/surround71.conf
-$(LOCAL_BUILT_MODULE): copy_alsa_conf
+TARGET_ALSA_CONF_FILES := $(addprefix $(TARGET_ALSA_CONF_PATH)/,$(ALSA_CONF_FILES))
+SOURCE_ALSA_CONF_FILES := $(addprefix $(SOURCE_ALSA_CONF_PATH)/,$(ALSA_CONF_FILES))
+$(TARGET_ALSA_CONF_FILES) &: $(SOURCE_ALSA_CONF_FILES)
+ mkdir -p $(TARGET_ALSA_CONF_PATH)
+ rsync -rlpgoD $(SOURCE_ALSA_CONF_PATH)/alsa.conf $(TARGET_ALSA_CONF_PATH)
+ rsync -rlpgoD $(SOURCE_ALSA_CONF_PATH)/cards $(TARGET_ALSA_CONF_PATH)
+ rsync -rlpgoD $(SOURCE_ALSA_CONF_PATH)/pcm $(TARGET_ALSA_CONF_PATH)
+
+$(LOCAL_BUILT_MODULE): | $(TARGET_ALSA_CONF_FILES)
