diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2018-03-29 13:30:08 +0800 |
|---|---|---|
| committer | Bowgo Tsai <bowgotsai@google.com> | 2018-03-29 15:05:33 +0800 |
| commit | dfded418498249d194f6cc85e15698e6a805bd0e (patch) | |
| tree | 25da5fd3b2ebc7042ec005ddce91e322c581a5da | |
| parent | d810b7eed1cc17f15a8690b1e6d52437fcabbda2 (diff) | |
| download | bonito-dfded418498249d194f6cc85e15698e6a805bd0e.tar.gz | |
Temporarily disable product.img
Re-lands this when OTA support for /product is ready.
Bug: 70673785
Test: Booted a blueline
Change-Id: Idddd37fea1eaf21af29c3a8509b1f2190b1b8531
| -rw-r--r-- | BoardConfig-common.mk | 7 | ||||
| -rw-r--r-- | CleanSpec.mk | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 8427c3b7..968d91d6 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -77,9 +77,10 @@ BOARD_AVB_ENABLE := true BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true # product.img -BOARD_PRODUCTIMAGE_PARTITION_SIZE := 314572800 -BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_COPY_OUT_PRODUCT := product +# TODO (bowgotsai): re-enable it when OTA flow is ready. +# BOARD_PRODUCTIMAGE_PARTITION_SIZE := 314572800 +# BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 +# TARGET_COPY_OUT_PRODUCT := product # system.img BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2579496960 diff --git a/CleanSpec.mk b/CleanSpec.mk index 71394f1f..37eeaa21 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -55,3 +55,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/vndk-sp/libz.so) # Remove Vibrator HAL 1.1 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.vibrator@1.1-service.crosshatch.rc) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.vibrator@1.1-service.crosshatch) + +# Remove /product mount point +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/product) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product) |