commit 0ccbdc281d45d13246c1537df8ae2ed669399378
author Rom Lemarchand <romlem@android.com> Thu Mar 03 14:47:45 2016 -0800
committer Rom Lemarchand <romlem@google.com> Wed Mar 09 12:31:24 2016 -0800
tree 5422cf7233953727b63d599b70248edf4792b442
parent 6fb248dfda88677073340945aef7867aa40ba993

angler: changes for building without recovery

Update files copied and build variables when building without recovery

Bug: 27570925
Change-Id: I4dff698af734e02a999dd7fd38cf7492b7c0af38

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4c1d530..efb9b94 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -87,16 +87,22 @@
 
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432
+ifneq ($(TARGET_NO_RECOVERY),true)
+  BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432
+endif
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 26503790080
-BOARD_CACHEIMAGE_PARTITION_SIZE := 104857600
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+ifneq ($(TARGET_NO_RECOVERY),true)
+  BOARD_CACHEIMAGE_PARTITION_SIZE := 104857600
+  BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+endif
 BOARD_FLASH_BLOCK_SIZE := 131072
 
 BOARD_HAL_STATIC_LIBRARIES := libdumpstate.angler
 
-TARGET_RECOVERY_FSTAB = device/huawei/angler/fstab.angler
+ifneq ($(TARGET_NO_RECOVERY),true)
+  TARGET_RECOVERY_FSTAB = device/huawei/angler/fstab.angler
+endif
 TARGET_COPY_OUT_VENDOR := vendor
 TARGET_RELEASETOOLS_EXTENSIONS := device/huawei/angler
 

device.mk

diff --git a/device.mk b/device.mk
index 09dfc56..b3e9237 100644
--- a/device.mk
+++ b/device.mk
@@ -28,16 +28,19 @@
   LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
 endif
 
-PRODUCT_COPY_FILES := \
+PRODUCT_COPY_FILES += \
     $(LOCAL_KERNEL):kernel
 
 PRODUCT_COPY_FILES += \
     device/huawei/angler/init.angler.rc:root/init.angler.rc \
     device/huawei/angler/init.angler.usb.rc:root/init.angler.usb.rc \
-    device/huawei/angler/fstab.angler:root/fstab.angler \
     device/huawei/angler/ueventd.angler.rc:root/ueventd.angler.rc \
     device/huawei/angler/init.angler.power.sh:system/bin/init.angler.power.sh
 
+ifneq ($(TARGET_NO_RECOVERY),true)
+  PRODUCT_COPY_FILES += device/huawei/angler/fstab.angler:root/fstab.angler
+endif
+
 ifeq ($(TARGET_USES_CHINOOK_SENSORHUB),true)
 PRODUCT_COPY_FILES += \
     device/huawei/angler/init.angler.sensorhub.rc:root/init.angler.sensorhub.rc