p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix build error for sdk_gphone_x86_64-userdebug" 

This reverts commit 6924b25729.

Reason for revert: with the following fix, this workaround is no longer needed.
  https://android-review.googlesource.com/c/platform/build/+/762663

Bug: 112322265
Change-Id: I07363f6a5aa1697b6f7702343f3120e1049f07d8
Test: build sdk_gphone_x86_64-userdebug
This commit is contained in:
Bowgo Tsai 2018-10-04 02:14:54 +00:00
parent 6924b25729
commit 3ac95b53f4
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/board/BoardConfigGsiCommon.mk
View File

@ -10,10 +10,8 @@ TARGET_USERIMAGES_USE_EXT4 := true
# we explicit specify this need below (even though it's the current default).
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
# Enable dynamic system image size and reserved 128MB in it.
# Currently the reserve size includes verified boot metadata.
# TODO: adjust to a smaller value if the reserved size is only for file system.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 134217728
# Enable dynamic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
# Android Verified Boot (AVB):
# 1) Sets BOARD_AVB_ENABLE to sign the GSI image.

6
target/board/treble_common.mk
View File

@ -35,10 +35,8 @@ TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_USE_F2FS := true
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
# Enable dynamic system image size and reserved 128MB in it.
# Currently the reserve size includes verified boot metadata.
# TODO: adjust to a smaller value if the reserved size is only for file system.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 134217728
# Enable dynamic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
# Generic AOSP image always requires separate vendor.img
TARGET_COPY_OUT_VENDOR := vendor