diff options
| author | Roman Kiryanov <rkir@google.com> | 2024-04-30 13:04:15 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2024-04-30 13:04:15 -0700 |
| commit | 2b49deb4420ba7ff0e7191baabf9c6a466c49a17 (patch) | |
| tree | d506679f4c7f997e4d2aa51448f8035a9db42d14 | |
| parent | aa7a6aa61d3bf7502fb0db78e8c66899b1c437f1 (diff) | |
| download | goldfish-2b49deb4420ba7ff0e7191baabf9c6a466c49a17.tar.gz | |
Cleanup around partition sizes
calculate BOARD_SUPER_PARTITION_SIZE instead of
hardcoding.
Bug: 337081933
Test: presubmit
Change-Id: I3bcf34130e7985d3affb57028d0ed8665fb0e0f8
Signed-off-by: Roman Kiryanov <rkir@google.com>
| -rw-r--r-- | 64bitonly/product/sdk_phone16k_arm64.mk | 5 | ||||
| -rw-r--r-- | 64bitonly/product/sdk_phone16k_x86_64.mk | 5 | ||||
| -rw-r--r-- | 64bitonly/product/sdk_phone64_arm64.mk | 5 | ||||
| -rw-r--r-- | 64bitonly/product/sdk_phone64_x86_64.mk | 5 | ||||
| -rw-r--r-- | 64bitonly/product/sdk_tablet_arm64.mk | 5 | ||||
| -rw-r--r-- | 64bitonly/product/sdk_tablet_x86_64.mk | 6 |
6 files changed, 12 insertions, 19 deletions
diff --git a/64bitonly/product/sdk_phone16k_arm64.mk b/64bitonly/product/sdk_phone16k_arm64.mk index 0c04300d..6e7eda69 100644 --- a/64bitonly/product/sdk_phone16k_arm64.mk +++ b/64bitonly/product/sdk_phone16k_arm64.mk @@ -22,9 +22,8 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -# 1.5G + 8M -BOARD_SUPER_PARTITION_SIZE ?= 1619001344 -BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 1610612736 +BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 ) +BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 ) # +8M # # All components inherited here go to system image diff --git a/64bitonly/product/sdk_phone16k_x86_64.mk b/64bitonly/product/sdk_phone16k_x86_64.mk index 88180cc7..f5776042 100644 --- a/64bitonly/product/sdk_phone16k_x86_64.mk +++ b/64bitonly/product/sdk_phone16k_x86_64.mk @@ -15,9 +15,8 @@ # PRODUCT_USE_DYNAMIC_PARTITIONS := true -# 1.5G + 8M -BOARD_SUPER_PARTITION_SIZE ?= 1619001344 -BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 1610612736 +BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 ) +BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 ) # +8M # # All components inherited here go to system image diff --git a/64bitonly/product/sdk_phone64_arm64.mk b/64bitonly/product/sdk_phone64_arm64.mk index 1b1f11cf..5578b4e5 100644 --- a/64bitonly/product/sdk_phone64_arm64.mk +++ b/64bitonly/product/sdk_phone64_arm64.mk @@ -22,9 +22,8 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -# 1.5G + 8M -BOARD_SUPER_PARTITION_SIZE ?= 1619001344 -BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 1610612736 +BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 ) +BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 ) # +8M # # All components inherited here go to system image diff --git a/64bitonly/product/sdk_phone64_x86_64.mk b/64bitonly/product/sdk_phone64_x86_64.mk index e0bc252c..d77f6718 100644 --- a/64bitonly/product/sdk_phone64_x86_64.mk +++ b/64bitonly/product/sdk_phone64_x86_64.mk @@ -15,9 +15,8 @@ # PRODUCT_USE_DYNAMIC_PARTITIONS := true -# 1.5G + 8M -BOARD_SUPER_PARTITION_SIZE ?= 1619001344 -BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 1610612736 +BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 ) +BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 ) # +8M # # All components inherited here go to system image diff --git a/64bitonly/product/sdk_tablet_arm64.mk b/64bitonly/product/sdk_tablet_arm64.mk index b3aa7d35..4a06effc 100644 --- a/64bitonly/product/sdk_tablet_arm64.mk +++ b/64bitonly/product/sdk_tablet_arm64.mk @@ -16,9 +16,8 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true EMULATOR_DISABLE_RADIO := true -# 1.5G + 8M -BOARD_SUPER_PARTITION_SIZE := 1619001344 -BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 1610612736 +BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 ) +BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 ) # +8M PRODUCT_COPY_FILES += \ device/generic/goldfish/tablet/data/etc/display_settings.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display_settings.xml \ diff --git a/64bitonly/product/sdk_tablet_x86_64.mk b/64bitonly/product/sdk_tablet_x86_64.mk index 5b20e657..96e7e420 100644 --- a/64bitonly/product/sdk_tablet_x86_64.mk +++ b/64bitonly/product/sdk_tablet_x86_64.mk @@ -16,10 +16,8 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true EMULATOR_DISABLE_RADIO := true -# 1.5G + 8M -BOARD_SUPER_PARTITION_SIZE := 1619001344 -BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 1610612736 - +BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= $(shell expr 1536 \* 1048576 ) +BOARD_SUPER_PARTITION_SIZE := $(shell expr $(BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE) + 8388608 ) # +8M PRODUCT_COPY_FILES += \ device/generic/goldfish/tablet/data/etc/display_settings.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display_settings.xml \ |