summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2017-03-01 17:51:24 -0800
committerYifan Hong <elsk@google.com>2017-03-01 17:51:24 -0800
commit9103656708ff1534686be7a9414badee07e73dbd (patch)
tree034731eb042aa392d526a109023ff479f70cf94f
parentbdadfb582069c64a7f8b158fecb2579b90b1bbc6 (diff)
downloadhikey-9103656708ff1534686be7a9414badee07e73dbd.tar.gz
vintf.xml => manifest.xml.
Bug: 35870239 Test: pass Change-Id: Ie18e6f814fe3ee77dfdc65cf80d27e48bc3b27b7
-rw-r--r--device-common.mk2
-rw-r--r--manifest.xml (renamed from vintf.xml)0
2 files changed, 1 insertions, 1 deletions
diff --git a/device-common.mk b/device-common.mk
index 1d1651e2..b541e8a9 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -90,7 +90,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
- device/linaro/hikey/vintf.xml:vendor/manifest.xml \
+ device/linaro/hikey/manifest.xml:vendor/manifest.xml \
device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
device/linaro/hikey/audio/audio_policy.conf:system/etc/audio_policy.conf
diff --git a/vintf.xml b/manifest.xml
index bdd4753b..bdd4753b 100644
--- a/vintf.xml
+++ b/manifest.xml