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

Commit 414d7c6e authored by SzuWei Lin's avatar SzuWei Lin Committed by android-build-merger
Browse files

Merge "Apply vndk_package to generic system image" into oc-mr1-dev 

am: e6262be0

Change-Id: I0eecc4fe85dce729a8e9cc5d72066d4cb41f5543
parents 4a18f97b e6262be0

target/board/generic_arm_a/BoardConfig.mk

+0 −4
Original line number Diff line number Diff line
@@ -21,7 +21,3 @@ TARGET_ARCH_VARIANT := armv7-a-neon 
TARGET_CPU_ABI := armeabi-v7a

TARGET_CPU_ABI2 := armeabi

TARGET_CPU_VARIANT := generic
 


# b/64458958

# Partition size is 734MB for ARM32 (non A/B update)

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 769654784

target/board/generic_arm_ab/BoardConfig.mk

+0 −4
Original line number Diff line number Diff line
@@ -25,7 +25,3 @@ TARGET_CPU_VARIANT := generic 
# Enable A/B update

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 


# b/64458958

# Partition size is 734MB for ARM32 (A/B update)

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 769654784

target/board/treble_common.mk

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
# Common boardconfig settings for generic AOSP products targetting mobile

# (phone/table) devices.



# VNDK

BOARD_VNDK_VERSION := current



# Properties

TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop

BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

target/board/treble_common_32.mk

+2 −2
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 


include build/make/target/board/treble_common.mk



# Partition size is default 0.75GB (768MB) for 32 bits projects

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 805306368
 
# Partition size is default 1GB (1024MB) for 32 bits projects

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824

target/board/treble_common_64.mk

+2 −2
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ include build/make/target/board/treble_common.mk 
# Enable 64-bits binder

TARGET_USES_64_BIT_BINDER := true



# Partition size is default 1.25GB (1280MB) for 64 bits projects

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1342177280
 
# Partition size is default 1.5GB (1536MB) for 64 bits projects

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736