summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-31 23:02:24 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-31 23:02:24 +0000
commitd756fbd9f36e4900bcb927f312ae578880515732 (patch)
tree7421b5640cd39a75d09d82f12785353f2c37b509
parent577c1ecd924c5a9dcf6d0aabe3d6dda69e8032ed (diff)
parent9a5f48ee55a405e273d1c65adcc2e82027c0e516 (diff)
downloadhikey-d756fbd9f36e4900bcb927f312ae578880515732.tar.gz
Snap for 11031798 from 9a5f48ee55a405e273d1c65adcc2e82027c0e516 to sdk-release
Change-Id: I4410c92f2da59abe52d069e0eb7ff0a9c4d31cb4
-rw-r--r--AndroidProducts.mk10
-rw-r--r--hikey/BoardConfig.mk6
2 files changed, 8 insertions, 8 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 9193abca..12912923 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -18,8 +18,8 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/hikey960_tv.mk
COMMON_LUNCH_CHOICES := \
- hikey-userdebug \
- hikey64_only-userdebug \
- hikey_tv-userdebug \
- hikey960-userdebug \
- hikey960_tv-userdebug
+ hikey-trunk_staging-userdebug \
+ hikey64_only-trunk_staging-userdebug \
+ hikey_tv-trunk_staging-userdebug \
+ hikey960-trunk_staging-userdebug \
+ hikey960_tv-trunk_staging-userdebug
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index 5f03ddb2..78a16d0f 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -22,14 +22,14 @@ BOARD_KERNEL_CMDLINE += printk.devkmsg=on
TARGET_NO_DTIMAGE := true
BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560
ifeq ($(TARGET_USERDATAIMAGE_4GB), true) # to build for aosp-4g partition table
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 1595915776
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 1488961024
else
ifeq ($(TARGET_WITH_SWAP), true) # to build for swap-8g partition table
BOARD_USERDATAIMAGE_PARTITION_SIZE := 4246715904
else
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 5588893184
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 4515151360
endif
endif
BOARD_FLASH_BLOCK_SIZE := 131072