commit 449d5897ea7c28bb264541702cbdf2d13c687283
author Tao Bao <tbao@google.com> Mon Jun 24 16:10:29 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 24 16:10:29 2019 -0700
tree f774918b67c4e8b08b4c67baf94ff21016214607
parent 2cda03741605b6b604d05907d11305e5eea43f2b
parent 02e6a6128bac71ea2f1840d4c6ddcb1d93b6c789

Merge "Dark boot on dark theme." into qt-dev
am: 02e6a6128b

Change-Id: I23efa69331d722320d112ae1fee7e3aff82e78a0

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index fdd04a5..4662ae1 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -26,7 +26,7 @@
 BOARD_EXT4_SHARE_DUP_BLOCKS := true
 
 # sepolicy
-BOARD_SEPOLICY_DIRS += device/google/taimen/sepolicy
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/taimen/sepolicy
 
 # Kernel modules
 ifeq (,$(filter-out taimen_kasan, $(TARGET_PRODUCT)))

self-extractors/google_devices/staging/BoardConfigPartial.mk

diff --git a/self-extractors/google_devices/staging/BoardConfigPartial.mk b/self-extractors/google_devices/staging/BoardConfigPartial.mk
index fc1a83b..5f4f882 100644
--- a/self-extractors/google_devices/staging/BoardConfigPartial.mk
+++ b/self-extractors/google_devices/staging/BoardConfigPartial.mk
@@ -13,3 +13,8 @@
 # limitations under the License.
 
 BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/taimen/proprietary/vendor.img
+
+-include vendor/google/tools/android-info.mk
+ifdef USE_ANDROID_INFO
+  TARGET_BOARD_INFO_FILE := vendor/google_devices/taimen/android-info.txt
+endif