StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp

Browse Source 
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
This commit is contained in:
Guang Zhu
2012-07-11 19:36:17 -07:00
parent c16c945497 ef1335eda4
commit 96d9fa29cd
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/board/generic/BoardConfig.mk
View File

@@ -29,9 +29,6 @@ BOARD_USES_GENERIC_AUDIO := true
# no hardware camera # no hardware camera
USE_CAMERA_STUB := true 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 # Enable dex-preoptimization to speed up the first boot sequence
# of an SDK AVD. Note that this operation only works on Linux for now # of an SDK AVD. Note that this operation only works on Linux for now
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)

3
target/board/generic_x86/BoardConfig.mk
View File

@@ -21,9 +21,6 @@ USE_CAMERA_STUB := true
# customize the malloced address to be 16-byte aligned # customize the malloced address to be 16-byte aligned
BOARD_MALLOC_ALIGNMENT := 16 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 # Enable dex-preoptimization to speed up the first boot sequence
# of an SDK AVD. Note that this operation only works on Linux for now # of an SDK AVD. Note that this operation only works on Linux for now
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)