diff options
| author | Treehugger Robot | 2018-08-14 18:32:20 -0500 |
|---|---|---|
| committer | Gerrit Code Review | 2018-08-14 18:32:20 -0500 |
| commit | aa47189e1c0465167795cfc28aa0472c1fdd3ba7 (patch) | |
| tree | 6b01f0c3ab7c04de4d3e9b0ef41ddbd27b7efa8e /target/board | |
| parent | 1c8485b713b085b8b3c451ca2a57d22d6a344213 (diff) | |
| parent | d1f319bc4874919055388fdcd175374a5de9075d (diff) | |
| download | platform-build-aa47189e1c0465167795cfc28aa0472c1fdd3ba7.tar.gz platform-build-aa47189e1c0465167795cfc28aa0472c1fdd3ba7.tar.xz platform-build-aa47189e1c0465167795cfc28aa0472c1fdd3ba7.zip | |
Merge "Remove default BUILD_BROKEN_DUP_RULES := false"
Diffstat (limited to 'target/board')
| -rw-r--r-- | target/board/BoardConfigEmuCommon.mk | 2 | ||||
| -rw-r--r-- | target/board/treble_common.mk | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index e8a562a22..ca2176c73 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk | |||
| @@ -36,5 +36,3 @@ DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml | |||
| 36 | 36 | ||
| 37 | BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common | 37 | BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common |
| 38 | BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true | 38 | BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true |
| 39 | |||
| 40 | BUILD_BROKEN_DUP_RULES := false | ||
diff --git a/target/board/treble_common.mk b/target/board/treble_common.mk index e314eba01..daa0f4cdb 100644 --- a/target/board/treble_common.mk +++ b/target/board/treble_common.mk | |||
| @@ -61,5 +61,3 @@ ifeq ($(BOARD_AVB_ENABLE),true) | |||
| 61 | $(error BOARD_AVB_ENABLE cannot be set for Treble GSI) | 61 | $(error BOARD_AVB_ENABLE cannot be set for Treble GSI) |
| 62 | endif | 62 | endif |
| 63 | BOARD_BUILD_DISABLED_VBMETAIMAGE := true | 63 | BOARD_BUILD_DISABLED_VBMETAIMAGE := true |
| 64 | |||
| 65 | BUILD_BROKEN_DUP_RULES := false | ||