From f4c635a6743f48b9a4762d3a4a1411fcd4d45709 Mon Sep 17 00:00:00 2001 From: Keyan Mobli Date: Fri, 18 Feb 2011 00:15:49 -0600 Subject: [PATCH] Squashed commit of the following for nook color: commit ad70ab9856c9aeaffc1765e252d2322f088acac9 Author: fattire Date: Thu Feb 17 13:45:53 2011 -0800 Name fix. commit fa73a129959b03b730f5eb2f54132fc9575a0d14 Author: fattire Date: Thu Feb 17 12:10:52 2011 -0800 cm: Bump for RC1 commit ef71687501e7a4c57915ad4b1f4a7a92af09f256 Author: Keyan Mobli Date: Thu Feb 17 12:15:09 2011 -0600 encore: doesn't need softkeys now that it's in the statusbar Change-Id: Ic630520836ea6acdaf641fbdf4726619b6aaf333 commit 0ad5e1736e1d0fd90aefb684c0b33e6939ea6695 Author: Brandon Bennett Date: Wed Jan 19 12:41:24 2011 -0700 Move to mdpi Change-Id: I83d3c3c487f2177e7dc6574311e56a7ec03ea137 commit b3ef4e32c19272feb154ab31d3d7ea3b5a493751 Author: Brandon Bennett Date: Wed Jan 19 12:39:48 2011 -0700 Fix the finger to allow for proper market access. Change-Id: I17e242a6f2b4a2c2027927db2792cd6d47bf210e commit 147274e71a7f8b456dbc208d62a630233481ab3b Author: fattire Date: Tue Jan 18 18:46:37 2011 -0800 fix uh, typo... commit 4e7572732d9bd5c10018eaa1f2f15f351a837d01 Author: fattire Date: Tue Jan 18 18:42:25 2011 -0800 TARGET_BUILD_TYPE -> userdebug, same as all other projects. From -eng. Won't build everything we don't need hopefully, but we'll still debug what we do need. commit 64c6df4b50d298da181c55a868457c8cb1b5a13d Author: Brandon Bennett Date: Tue Jan 18 00:25:27 2011 -0700 Rename nookcolor to encore Change-Id: I36617d5e0baefba2c0d0cbe95fdf87f76a41380d commit 7e40fffb530ccadcdc71cd2c36002d8ba3164b49 Merge: c1634f3 1d3ebd7 Author: fattire Date: Sat Jan 15 13:12:31 2011 -0800 trying to fix clash with upstream commit 31b3c0211a41ebb2975791601caa438954275eaf Author: fattire Date: Sat Jan 15 13:11:41 2011 -0800 syncing with upstream commit 1ee0e2ea0e88cbb06650fc10cefc102e7aea9bd6 Merge: cc0a549 1d3ebd7 Author: fattire Date: Sat Jan 15 13:05:24 2011 -0800 hopefully resolve the clash here commit 3f479190eb10c4c13a2f9f64e7b11cc49ca574c8 Author: cicada Date: Sun Jan 9 17:40:20 2011 -0700 adding the cyanogen_nookcolor target to the proper vendorsetup.sh commit 8a0226559f789ebc4755432a622ea4347ad45caf Author: fattire Date: Sat Jan 8 18:31:42 2011 -0800 initial checkin of nc stuff commit c274dc118539dc79b2811db6ff878b968b1a3021 Author: fattire Date: Sat Jan 8 18:31:42 2011 -0800 initial checkin of nc stuff Change-Id: I42ef09a93f54b9383fb49f2903f6ea5ed0385bc0 Change-Id: Id81f1cbbb19122ecb4fd28315a07344ead77e3c9 --- .../apps/CMParts/res/values/config.xml | 8 ++++ products/AndroidProducts.mk | 1 + products/cyanogen_encore.mk | 38 +++++++++++++++++++ vendorsetup.sh | 1 + 4 files changed, 48 insertions(+) create mode 100644 overlay/encore/packages/apps/CMParts/res/values/config.xml create mode 100644 products/cyanogen_encore.mk diff --git a/overlay/encore/packages/apps/CMParts/res/values/config.xml b/overlay/encore/packages/apps/CMParts/res/values/config.xml new file mode 100644 index 00000000..22dfadbb --- /dev/null +++ b/overlay/encore/packages/apps/CMParts/res/values/config.xml @@ -0,0 +1,8 @@ + + + + false + + false + + diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk index 5a812635..2b72e595 100644 --- a/products/AndroidProducts.mk +++ b/products/AndroidProducts.mk @@ -6,6 +6,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/cyanogen_buzz.mk \ $(LOCAL_DIR)/cyanogen_click.mk \ $(LOCAL_DIR)/cyanogen_crespo.mk \ + $(LOCAL_DIR)/cyanogen_encore.mk \ $(LOCAL_DIR)/cyanogen_espresso.mk \ $(LOCAL_DIR)/cyanogen_hero.mk \ $(LOCAL_DIR)/cyanogen_heroc.mk \ diff --git a/products/cyanogen_encore.mk b/products/cyanogen_encore.mk new file mode 100644 index 00000000..f6ba7682 --- /dev/null +++ b/products/cyanogen_encore.mk @@ -0,0 +1,38 @@ +# Inherit AOSP device configuration for encore. +$(call inherit-product, device/bn/encore/device_encore.mk) + +# Inherit some common cyanogenmod stuff. +$(call inherit-product, vendor/cyanogen/products/common.mk) + +# +# Setup device specific product configuration. +# +PRODUCT_NAME := cyanogen_encore +PRODUCT_BRAND := bn +PRODUCT_DEVICE := encore +PRODUCT_MODEL := NookColor +PRODUCT_MANUFACTURER := bn +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=encore BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys" + +PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/encore + +# +# Set ro.modversion +# +ifdef CYANOGEN_NIGHTLY + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-encore +else + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC1-encore + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC1-encore-KANG + endif +endif + + +PRODUCT_COPY_FILES += \ + vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip + diff --git a/vendorsetup.sh b/vendorsetup.sh index f66a232e..3e5860f6 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -6,6 +6,7 @@ add_lunch_combo cyanogen_buzz-eng add_lunch_combo cyanogen_click-eng add_lunch_combo cyanogen_crespo-eng #add_lunch_combo cyanogen_dream_sapphire-eng +add_lunch_combo cyanogen_encore-eng add_lunch_combo cyanogen_espresso-eng add_lunch_combo cyanogen_generic-eng add_lunch_combo cyanogen_glacier-eng