Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b81d0835 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolve merge conflicts of dc1afa9c to master. 

Change-Id: I4236d9f79cbca689d0fcc400d4c10a663209bc2a
parents df674b1e dc1afa9c

target/board/generic/BoardConfig.mk

+4 −1
Original line number Diff line number Diff line
@@ -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

target/board/generic_arm64/BoardConfig.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

target/board/generic_mips/BoardConfig.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

target/board/generic_mips64/BoardConfig.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

target/board/generic_x86/BoardConfig.mk

+0 −2
Original line number Diff line number Diff line
@@ -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