From 819f6bd5bdd6a2ba3024a08e9d13059d1b8ebedb Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sun, 11 Jul 2010 13:51:32 -0700 Subject: [PATCH] RC1 --- CHANGELOG.mkdn | 3 ++- products/common.mk | 2 ++ products/cyanogen_bravo.mk | 4 ---- products/cyanogen_dream_sapphire.mk | 4 ---- products/cyanogen_espresso.mk | 4 ---- products/cyanogen_hero.mk | 4 ---- products/cyanogen_inc.mk | 4 ---- products/cyanogen_passion.mk | 4 ---- products/cyanogen_sholes.mk | 2 +- 9 files changed, 5 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn index fb8e5860..3a0ad26d 100644 --- a/CHANGELOG.mkdn +++ b/CHANGELOG.mkdn @@ -43,6 +43,7 @@ CHANGELOG * Common: Bluetooth HID support - Erin Yueh @ 0xlabs * Common: Mouse pointer support - Chih-Wei Huang (android-x86) * Common: Configurable install location + allow move any app to external storage - Cyanogen +* Common: Busybox, nano, and libncurses are now built from source. - cvpcs * N1/DS: Kernel 2.6.34 with Pershoot/Kmobs clock settings * N1: Maintainer: Cyanogen * D/S: Maintainer: Cyanogen @@ -52,6 +53,6 @@ CHANGELOG * Droid: Maintainer: Koush * Hero: Lox (GSM), Darchstar (CDMA) * Bravo (Desire): Maintainers: behnaam, Kali- -* Incredible: Maintiner: Koush +* Incredible: Maintainer: Koush * Espresso (Slide): Maintainers: Wes Garner, Chris Soyars diff --git a/products/common.mk b/products/common.mk index 58ca530d..d553c963 100644 --- a/products/common.mk +++ b/products/common.mk @@ -3,6 +3,8 @@ PRODUCT_NAME := cyanogen PRODUCT_BRAND := cyanogen PRODUCT_DEVICE := generic +PRODUCT_PACKAGES += ADWLauncher + # Use edify for otapackage PRODUCT_SPECIFIC_DEFINES += TARGET_OTA_SCRIPT_MODE=edify diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk index b994d101..4927995e 100644 --- a/products/cyanogen_bravo.mk +++ b/products/cyanogen_bravo.mk @@ -49,7 +49,3 @@ endif # PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/passion/media/bootanimation.zip:system/media/bootanimation.zip - -ifndef DEFAULT_LAUNCHER - PRODUCT_PACKAGES += ADWLauncher -endif diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk index cc81e382..26a2d2a8 100644 --- a/products/cyanogen_dream_sapphire.mk +++ b/products/cyanogen_dream_sapphire.mk @@ -57,7 +57,3 @@ PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/dream_sapphire/etc/init.d/02audio_profile:system/etc/init.d/02audio_profile \ vendor/cyanogen/prebuilt/dream_sapphire/etc/AudioPara_dream.csv:system/etc/AudioPara_dream.csv \ vendor/cyanogen/prebuilt/dream_sapphire/etc/AudioPara_sapphire.csv:system/etc/AudioPara_sapphire.csv - -ifndef DEFAULT_LAUNCHER - PRODUCT_PACKAGES += ADWLauncher -endif diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk index d61491fc..bd06f35a 100644 --- a/products/cyanogen_espresso.mk +++ b/products/cyanogen_espresso.mk @@ -39,7 +39,3 @@ endif # PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/espresso/media/bootanimation.zip:system/media/bootanimation.zip - -ifndef DEFAULT_LAUNCHER - PRODUCT_PACKAGES += ADWLauncher -endif \ No newline at end of file diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk index 92ef71a3..18c36673 100644 --- a/products/cyanogen_hero.mk +++ b/products/cyanogen_hero.mk @@ -40,7 +40,3 @@ endif # PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/dream_sapphire/media/bootanimation.zip:system/media/bootanimation.zip - -ifndef DEFAULT_LAUNCHER - PRODUCT_PACKAGES += ADWLauncher -endif \ No newline at end of file diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk index f1d6429e..aa46e3d2 100644 --- a/products/cyanogen_inc.mk +++ b/products/cyanogen_inc.mk @@ -25,7 +25,3 @@ else PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-6.0.0-N1-test0 endif - -ifndef DEFAULT_LAUNCHER - PRODUCT_PACKAGES += ADWLauncher -endif \ No newline at end of file diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk index e055151b..626e3eea 100644 --- a/products/cyanogen_passion.mk +++ b/products/cyanogen_passion.mk @@ -51,7 +51,3 @@ endif # PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/passion/media/bootanimation.zip:system/media/bootanimation.zip - -ifndef DEFAULT_LAUNCHER - PRODUCT_PACKAGES += ADWLauncher -endif diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk index 10723e60..d51dd8c6 100644 --- a/products/cyanogen_sholes.mk +++ b/products/cyanogen_sholes.mk @@ -24,7 +24,7 @@ ifdef CYANOGEN_NIGHTLY ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid else PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-6.0.0-Droid-alpha7 + ro.modversion=CyanogenMod-6.0.0-Droid-RC1 endif PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRF84B BUILD_DISPLAY_ID=FRF84B PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2/FRF84B/42477:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2 FRF84B 42477 release-keys" BUILD_NUMBER=42477 BUILD_UTC_DATE=1277333704 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build