From d9f4e409332669dbb8c1229ebf6d9998610a2186 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Wed, 30 Jun 2010 02:07:06 -0400 Subject: [PATCH] Add Dream/Sapphire stuff. --- .../media/bootanimation.zip | Bin products/AndroidProducts.mk | 3 +- products/cyanogen_dream.mk | 2 +- products/cyanogen_sapphire.mk | 35 ++++++++++++++++++ vendorsetup.sh | 1 + 5 files changed, 39 insertions(+), 2 deletions(-) rename prebuilt/{dream => dream-sapphire}/media/bootanimation.zip (100%) create mode 100644 products/cyanogen_sapphire.mk diff --git a/prebuilt/dream/media/bootanimation.zip b/prebuilt/dream-sapphire/media/bootanimation.zip similarity index 100% rename from prebuilt/dream/media/bootanimation.zip rename to prebuilt/dream-sapphire/media/bootanimation.zip diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk index d24bdd7f..28e21bbe 100644 --- a/products/AndroidProducts.mk +++ b/products/AndroidProducts.mk @@ -3,4 +3,5 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/cyanogen_inc.mk \ $(LOCAL_DIR)/cyanogen_heroc.mk \ $(LOCAL_DIR)/cyanogen_sholes.mk \ - $(LOCAL_DIR)/cyanogen_dream.mk + $(LOCAL_DIR)/cyanogen_dream.mk \ + $(LOCAL_DIR)/cyanogen_sapphire.mk diff --git a/products/cyanogen_dream.mk b/products/cyanogen_dream.mk index 8caef8c1..4809d1df 100644 --- a/products/cyanogen_dream.mk +++ b/products/cyanogen_dream.mk @@ -30,6 +30,6 @@ endif # Copy dream specific prebuilt files # PRODUCT_COPY_FILES += \ - vendor/cyanogen/prebuilt/dream/media/bootanimation.zip:system/media/bootanimation.zip \ + vendor/cyanogen/prebuilt/dream-sapphire/media/bootanimation.zip:system/media/bootanimation.zip \ USE_CAMERA_STUB := false diff --git a/products/cyanogen_sapphire.mk b/products/cyanogen_sapphire.mk new file mode 100644 index 00000000..2d847829 --- /dev/null +++ b/products/cyanogen_sapphire.mk @@ -0,0 +1,35 @@ +# Inherit AOSP device configuration for sapphire. +$(call inherit-product, device/htc/sapphire/full_sapphire.mk) + +# Inherit some common cyanogenmod stuff. +$(call inherit-product, vendor/cyanogen/products/common.mk) + +# +# Setup device specific product configuration. +# +PRODUCT_NAME := cyanogen_sapphire +PRODUCT_BRAND := google +PRODUCT_DEVICE := sapphire +PRODUCT_MODEL := sapphire +PRODUCT_MANUFACTURER := HTC +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF83 BUILD_DISPLAY_ID=FRF83 PRODUCT_NAME=sapphire BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF83/42295:user/release-keys +PRIVATE_BUILD_DESC="sapphire-user 2.2 FRF83 42295 release-keys" + +# +# Set ro.modversion +# +ifdef CYANOGEN_NIGHTLY + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Sapphire +else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-6.0.0-Sapphire-test0 +endif + +# +# Copy sapphire specific prebuilt files +# +PRODUCT_COPY_FILES += \ + vendor/cyanogen/prebuilt/dream-sapphire/media/bootanimation.zip:system/media/bootanimation.zip \ + +USE_CAMERA_STUB := false diff --git a/vendorsetup.sh b/vendorsetup.sh index 1e4fa48e..6c23052c 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -3,3 +3,4 @@ add_lunch_combo cyanogen_inc-eng add_lunch_combo cyanogen_heroc-eng add_lunch_combo cyanogen_sholes-eng add_lunch_combo cyanogen_dream-eng +add_lunch_combo cyanogen_sapphire-eng