aceopt: changes to transform to internal storage variant

* Search and replace ace -> aceopt where appropriate.
* Set new BOARD_SYSTEMIMAGE_PARTITION_SIZE
* Set TARGET_VENDOR_DEVICE_NAME to keep ro.product.device as ace.
  Camera blobs are using this property and refuse to work with aceopt.
* Set TARGET_OTA_ASSERT_DEVICE to aceopt to keep recoveries separate.
* Switch TARGET_RECOVERY_FSTAB to new fstab

Change-Id: If58bcc70070322c3047950e52fe61d081206ecb1

Android.mk

@@ -14,6 +14,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),ace)
+ifeq ($(TARGET_DEVICE),aceopt)
     include $(call all-makefiles-under,$(LOCAL_PATH))
 endif

BoardConfig.mk

@@ -49,15 +49,22 @@ BOARD_KERNEL_PAGE_SIZE := 4096
 #mmcblk0p28: 014bfe00 00000200 "devlog"
 #mmcblk0p29: 00040000 00000200 "pdata"
 
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 585101312
+# Use data partition size here because we are using
+# it as /system
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1232072704
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 1232072704
 BOARD_BOOTIMAGE_PARTITION_SIZE := 4194304
 BOARD_FLASH_BLOCK_SIZE := 262144
 
+# Keep ro.product.device as ace to keep camera blobs happy.
+TARGET_VENDOR_DEVICE_NAME := ace
+# But use aceopt for updater-script assert check
+TARGET_OTA_ASSERT_DEVICE := aceopt
+
 TARGET_KERNEL_SOURCE := kernel/htc/msm7x30
 TARGET_KERNEL_CONFIG := ace_defconfig
 
-TARGET_RECOVERY_FSTAB := device/htc/msm7x30-common/rootdir/fstab.htc7x30
+TARGET_RECOVERY_FSTAB := device/htc/msm7x30-common/rootdir/fstab_variant.htc7x30
 TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
 BOARD_HAS_NO_SELECT_BUTTON := true
 
@@ -70,8 +77,8 @@ TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/class/android_usb/android0/f_mass_storag
 BOARD_VOLD_MAX_PARTITIONS := 36
 
 # Bluetooth
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/htc/ace/bluetooth
-BOARD_BLUEDROID_VENDOR_CONF := device/htc/ace/bluetooth/libbt_vndcfg.txt
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/htc/aceopt/bluetooth
+BOARD_BLUEDROID_VENDOR_CONF := device/htc/aceopt/bluetooth/libbt_vndcfg.txt
 
 # Spade DSP profile
 COMMON_GLOBAL_CFLAGS += -DWITH_SPADE_DSP_PROFILE

ace.mk

@@ -14,16 +14,18 @@
 # call the proprietary setup
 $(call inherit-product, vendor/htc/ace/ace-vendor.mk)
 
+# HACK: Set TARGET_DEVICE for common configuration if blocks
+TARGET_DEVICE := aceopt
 # Inherit common msm7x30 configs
 $(call inherit-product, device/htc/msm7x30-common/msm7x30.mk)
 
 # HTC Audio
-$(call inherit-product, device/htc/ace/media_a1026.mk)
-$(call inherit-product, device/htc/ace/media_htcaudio.mk)
+$(call inherit-product, device/htc/aceopt/media_a1026.mk)
+$(call inherit-product, device/htc/aceopt/media_htcaudio.mk)
 
-DEVICE_PACKAGE_OVERLAYS += device/htc/ace/overlay
+DEVICE_PACKAGE_OVERLAYS += device/htc/aceopt/overlay
 
-COMMON_PATH := device/htc/ace
+COMMON_PATH := device/htc/aceopt
 
 # Boot ramdisk setup
 PRODUCT_PACKAGES += init.target.rc

cm.mk

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Inherit device configuration
-$(call inherit-product, device/htc/ace/full_ace.mk)
+$(call inherit-product, device/htc/aceopt/full_ace.mk)
 
 # Inherit common CM configuration
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
@@ -25,10 +25,10 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
 	PRIVATE_BUILD_DESC="htc_ace-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(shell date +%Y%m%d%H%M%S) test-keys"
 
 # Device identifier. This must come after all inclusions
-PRODUCT_NAME := cm_ace
+PRODUCT_NAME := cm_aceopt
 PRODUCT_GMS_CLIENTID_BASE := android-htc-rev
 
 PRODUCT_BOOTANIMATION := device/htc/msm7x30-common/rootdir/system/media/bootanimation.zip
 
 # Release name
-PRODUCT_RELEASE_NAME := ace
+PRODUCT_RELEASE_NAME := aceopt

full_ace.mk

@@ -16,16 +16,16 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Inherit from ace device
-$(call inherit-product, device/htc/ace/ace.mk)
+$(call inherit-product, device/htc/aceopt/ace.mk)
 
 # Boot Animation
 TARGET_SCREEN_HEIGHT := 800
 TARGET_SCREEN_WIDTH := 480
 TARGET_BOOTANIMATION_HALF_RES := true
 
 # Discard inherited values and use our own instead.
-PRODUCT_NAME := full_ace
-PRODUCT_DEVICE := ace
+PRODUCT_NAME := full_aceopt
+PRODUCT_DEVICE := aceopt
 PRODUCT_BRAND := htc_wwe
 PRODUCT_MANUFACTURER := HTC
 PRODUCT_MODEL := Desire HD

vendorsetup.sh

@@ -1,2 +1,2 @@
-add_lunch_combo cm_ace-userdebug
-add_lunch_combo cm_ace-eng
+add_lunch_combo cm_aceopt-userdebug
+add_lunch_combo cm_aceopt-eng