commit ed4ffa61aceae3f6f7d4ca0776f92f07435a4198
author Suprabh Shukla <suprabh@google.com> Thu May 24 10:19:54 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 24 10:19:54 2018 -0700
tree b7199e1f53afa546518034ec5ee1d5681d4e52e9
parent 7515647a3cfd071b1e000792c2357f0d7b9b41b4
parent d849542ba219986fcc3e20fc788a4e4a5efe138d

Merge "Removing feature location_network from aosp_taimen" into pi-dev am: 0db0c95194
am: d849542ba2

Change-Id: I75b5e782336ad85cb7475e94277ff970da109731

aosp_taimen.mk

diff --git a/aosp_taimen.mk b/aosp_taimen.mk
index fa46a05..5f2c414 100644
--- a/aosp_taimen.mk
+++ b/aosp_taimen.mk
@@ -30,7 +30,8 @@
     vndk_package
 
 PRODUCT_COPY_FILES += \
-    device/google/taimen/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
+    device/google/taimen/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
+    frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml
 
 PRODUCT_RESTRICT_VENDOR_FILES := owner