resolved conflicts for merge of ef1335ed
to jb-dev-plus-aosp
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
This commit is contained in:
@@ -29,9 +29,6 @@ BOARD_USES_GENERIC_AUDIO := true
|
||||
# no hardware camera
|
||||
USE_CAMERA_STUB := true
|
||||
|
||||
# Set /system/bin/sh to ash, not mksh, to make sure we can switch back.
|
||||
TARGET_SHELL := ash
|
||||
|
||||
# Enable dex-preoptimization to speed up the first boot sequence
|
||||
# of an SDK AVD. Note that this operation only works on Linux for now
|
||||
ifeq ($(HOST_OS),linux)
|
||||
|
@@ -21,9 +21,6 @@ USE_CAMERA_STUB := true
|
||||
# customize the malloced address to be 16-byte aligned
|
||||
BOARD_MALLOC_ALIGNMENT := 16
|
||||
|
||||
# Set /system/bin/sh to ash, not mksh, to make sure we can switch back.
|
||||
TARGET_SHELL := ash
|
||||
|
||||
# Enable dex-preoptimization to speed up the first boot sequence
|
||||
# of an SDK AVD. Note that this operation only works on Linux for now
|
||||
ifeq ($(HOST_OS),linux)
|
||||
|
Reference in New Issue
Block a user