diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-08-03 11:15:20 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-08-03 11:15:20 -0700 |
| commit | a94c36aa7e31bc802fa0db33e0cf95ae6860c392 (patch) | |
| tree | 7171a5ed06ad99cb4a7964df7932d90a4c860a6e /BoardConfigCommon.mk | |
| parent | 143a476a4cf46006f39c87f6344473ff64de6e72 (diff) | |
| parent | c3273fcbafab5477b9ecde925c1ff36bca1c1974 (diff) | |
| download | hikey-a94c36aa7e31bc802fa0db33e0cf95ae6860c392.tar.gz | |
resolve merge conflicts of c3273fc to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3e96d3dd7b22d9a40592e55f4dcbdae4474fb4ea
Diffstat (limited to 'BoardConfigCommon.mk')
| -rw-r--r-- | BoardConfigCommon.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 1f002352..ed87ef8d 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -36,6 +36,8 @@ TARGET_USE_PAN_DISPLAY := true SF_START_GRAPHICS_ALLOCATOR_SERVICE := true +TARGET_AUX_OS_VARIANT_LIST := neonkey + BOARD_SEPOLICY_DIRS += device/linaro/hikey/sepolicy BOARD_SEPOLICY_DIRS += system/bt/vendor_libs/linux/sepolicy |