From fc864c3ccf45c44e85455b9a16675821b021cfd0 Mon Sep 17 00:00:00 2001 From: Jef Oliver Date: Mon, 16 Aug 2010 04:40:47 -0600 Subject: [PATCH] Edit makefiles to set the ro.build.description correctly --- products/cyanogen_dream_sapphire.mk | 3 +-- products/cyanogen_hero.mk | 3 +-- products/cyanogen_heroc.mk | 6 ++---- products/cyanogen_liberty.mk | 3 +-- products/cyanogen_vibrant.mk | 5 ++--- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk index 65fdcbe9..29d2d1fd 100644 --- a/products/cyanogen_dream_sapphire.mk +++ b/products/cyanogen_dream_sapphire.mk @@ -15,8 +15,7 @@ PRODUCT_BRAND := google PRODUCT_DEVICE := dream_sapphire PRODUCT_MODEL := Dream/Sapphire PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys -PRIVATE_BUILD_DESC="passion-user 2.2 FRF91 43546 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2 FRF91 43546 release-keys" PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-ds.map diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk index bb8af938..d32d1dec 100644 --- a/products/cyanogen_hero.mk +++ b/products/cyanogen_hero.mk @@ -15,8 +15,7 @@ PRODUCT_BRAND := htc PRODUCT_DEVICE := hero PRODUCT_MODEL := Hero PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys -PRIVATE_BUILD_DESC="hero-user 2.2 FRF91 43546 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="hero-user 2.2 FRF91 43546 release-keys" # Enable Windows Media WITH_WINDOWS_MEDIA := true diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk index 5a487d50..15766aef 100644 --- a/products/cyanogen_heroc.mk +++ b/products/cyanogen_heroc.mk @@ -4,7 +4,7 @@ $(call inherit-product, device/htc/heroc/heroc.mk) # Inherit some common cyanogenmod stuff. $(call inherit-product, vendor/cyanogen/products/common.mk) -# Inherit apns list from common +# Inherit apns list from common $(call inherit-product, vendor/cyanogen/products/gsm.mk) # @@ -15,9 +15,7 @@ PRODUCT_BRAND := sprint PRODUCT_DEVICE := heroc PRODUCT_MODEL := HERO200 PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys -TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys -PRIVATE_BUILD_DESC="heroc-user 2.2 FRF91 43546 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="heroc-user 2.2 FRF91 43546 release-keys" # Use Prebuilt kernel from heroC device tree PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/heroc/kernel diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk index c5d9dee6..75ecf5a4 100644 --- a/products/cyanogen_liberty.mk +++ b/products/cyanogen_liberty.mk @@ -15,8 +15,7 @@ PRODUCT_BRAND := htc PRODUCT_DEVICE := liberty PRODUCT_MODEL := Liberty PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=htc_liberty BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys BUILD_VERSION_TAGS=release-keys -PRIVATE_BUILD_DESC="liberty-user 2.2 FRF91 43546 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=htc_liberty BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="liberty-user 2.2 FRF91 43546 release-keys" PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-liberty.map diff --git a/products/cyanogen_vibrant.mk b/products/cyanogen_vibrant.mk index 8aad6535..5e0cb23d 100644 --- a/products/cyanogen_vibrant.mk +++ b/products/cyanogen_vibrant.mk @@ -14,9 +14,8 @@ PRODUCT_NAME := cyanogen_vibrant PRODUCT_BRAND := google PRODUCT_DEVICE := SGH-T959 PRODUCT_MODEL := Vibrant -PRODUCT_MANUFACTURER := -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys -PRIVATE_BUILD_DESC="passion-user 2.2 FRF91 43546 release-keys" +PRODUCT_MANUFACTURER := +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="passion-user 2.2 FRF91 43546 release-keys" # Extra Vibrant overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vibrant