commit b2cb46186f672e9bf04ae2a0895d48498b657aa1
author android-build-team Robot <android-build-team-robot@google.com> Wed Dec 05 05:16:46 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 05 05:16:46 2018 +0000
tree ae377d141e5fb6b7afae826b44088272e34d0ea7
parent 4b11ddc7ad2b1a80522ef484f74f9af24df783b6
parent 3ef07b0323e5a26e143e22d4af7047e53ab49ec8

Merge cherrypicks of [5704859, 5705300, 5704034, 5704195, 5705082, 5704058, 5704059, 5704932, 5705340, 5705341, 5705342, 5705343, 5705344, 5705361, 5705362, 5705363, 5705364, 5704870, 5704196, 5705083, 5701785, 5701786, 5701787, 5704035, 5705261, 5705281, 5704036, 5704037, 5704038, 5704871, 5704933, 5704872, 5705347, 5705262, 5704934] into pi-qpr2-release

Change-Id: Ia9fe9bb2f4ada44a5b1261356194ec8547cdf33b

BoardConfig-common.mk

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 488e152..de21237 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -117,7 +117,7 @@
 # Install odex files into the other system image
 BOARD_USES_SYSTEM_OTHER_ODEX := true
 
-BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp
+BOARD_ROOT_EXTRA_SYMLINKS := /vendor/dsp:/dsp
 BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
 BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
 

device.mk

diff --git a/device.mk b/device.mk
index 3a429b9..d3b56c0 100644
--- a/device.mk
+++ b/device.mk
@@ -786,4 +786,4 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=3
+    ro.vendor.build.svn=5