resolve merge conflicts of dc1afa9c0f to master.

Change-Id: I4236d9f79cbca689d0fcc400d4c10a663209bc2a
This commit is contained in:
Chih-Hung Hsieh 2016-02-04 15:43:05 -08:00
commit b81d0835ac
6 changed files with 4 additions and 11 deletions

View File

@ -77,4 +77,7 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
USE_CLANG_PLATFORM_BUILD := true
ifeq ($(TARGET_PRODUCT),sdk)
# include an expanded selection of fonts for the SDK.
EXTENDED_FONT_FOOTPRINT := true
endif

View File

@ -84,5 +84,3 @@ BOARD_FLASH_BLOCK_SIZE := 512
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
USE_CLANG_PLATFORM_BUILD := true

View File

@ -61,5 +61,3 @@ BOARD_FLASH_BLOCK_SIZE := 512
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
USE_CLANG_PLATFORM_BUILD := true

View File

@ -75,5 +75,3 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
DEX_PREOPT_DEFAULT := nostripping
USE_CLANG_PLATFORM_BUILD := true

View File

@ -42,5 +42,3 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_SEPOLICY_DIRS += \
build/target/board/generic/sepolicy \
build/target/board/generic_x86/sepolicy
USE_CLANG_PLATFORM_BUILD := true

View File

@ -48,5 +48,3 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_SEPOLICY_DIRS += \
build/target/board/generic/sepolicy \
build/target/board/generic_x86/sepolicy
USE_CLANG_PLATFORM_BUILD := true