commit 56d08ec834ee092ede736dfcce120b42ffb85df0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 15 00:31:05 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 15 00:31:05 2018 +0000
tree 07b306fc465b8b44abf987cba7ce592b6c85b539
parent aa47189e1c0465167795cfc28aa0472c1fdd3ba7
parent 976c80ae86adfe7fe4f37d34ecae925b5fbe4660

Merge "ATest: Host native test config auto-gen support."

target/board/BoardConfigEmuCommon.mk

diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk
index e8a562a..ca2176c 100644
--- a/target/board/BoardConfigEmuCommon.mk
+++ b/target/board/BoardConfigEmuCommon.mk
@@ -36,5 +36,3 @@
 
 BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-
-BUILD_BROKEN_DUP_RULES := false

target/board/treble_common.mk

diff --git a/target/board/treble_common.mk b/target/board/treble_common.mk
index e314eba..daa0f4c 100644
--- a/target/board/treble_common.mk
+++ b/target/board/treble_common.mk
@@ -61,5 +61,3 @@
 $(error BOARD_AVB_ENABLE cannot be set for Treble GSI)
 endif
 BOARD_BUILD_DISABLED_VBMETAIMAGE := true
-
-BUILD_BROKEN_DUP_RULES := false

target/product/vndk/current.txt

diff --git a/target/product/vndk/current.txt b/target/product/vndk/current.txt
index a608690..55cfc38 100644
--- a/target/product/vndk/current.txt
+++ b/target/product/vndk/current.txt
@@ -115,6 +115,7 @@
 VNDK-core: android.hardware.power@1.0.so
 VNDK-core: android.hardware.power@1.1.so
 VNDK-core: android.hardware.power@1.2.so
+VNDK-core: android.hardware.power@1.3.so
 VNDK-core: android.hardware.radio.config@1.0.so
 VNDK-core: android.hardware.radio.deprecated@1.0.so
 VNDK-core: android.hardware.radio@1.0.so