summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-11-26 08:49:01 +0000
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2010-11-26 08:49:01 +0000
commite7f4354e1c1f2e3aa9a8c0ff637a1a6447266d71 (patch)
tree6883482901843156ccd73baeab59467adf8096a1
parent3ab0c56277ab03d677887d463d43524cdb309f0a (diff)
parent7986ca4b3c8d330718d01f4b5d52feb7778fedb9 (diff)
downloadvendor_replicant-e7f4354e1c1f2e3aa9a8c0ff637a1a6447266d71.zip
vendor_replicant-e7f4354e1c1f2e3aa9a8c0ff637a1a6447266d71.tar.gz
vendor_replicant-e7f4354e1c1f2e3aa9a8c0ff637a1a6447266d71.tar.bz2
Merge "Updated harmony build values to OTA values" into froyo
-rw-r--r--products/cyanogen_harmony.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk
index 0f4a5cb..fcea58b 100644
--- a/products/cyanogen_harmony.mk
+++ b/products/cyanogen_harmony.mk
@@ -1,4 +1,3 @@
-# Inherit AOSP device configuration for passion.
$(call inherit-product, device/nvidia/harmony/device_harmony.mk)
# Inherit some common cyanogenmod stuff.
@@ -11,7 +10,11 @@ PRODUCT_NAME := cyanogen_harmony
PRODUCT_BRAND := nvidia
PRODUCT_DEVICE := harmony
PRODUCT_MODEL := GTablet
-PRODUCT_MANUFACTURER := Viewsonic
+PRODUCT_MANUFACTURER := malata
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=harmony BUILD_FINGERPRINT=Flextronics/harmony/harmony/:2.2/FRF91/hudson-20101122-122046-TnT_SVN_2967:user/test-keys PRODUCT_BRAND=Flextronics TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=test-keys PRIVATE_BUILD_DESC="harmony-user 2.2 FRF91 hudson-20101122-122046-TnT_SVN_2967 test-keys" PRODUCT_MODEL=UPC300-2.2 PRODUCT_MANUFACTURER=malata
+
+# Extra overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/harmony
#
# Set ro.modversion
@@ -21,10 +24,11 @@ ifdef CYANOGEN_NIGHTLY
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Harmony
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.1.0-Beta3-Harmony
+ ro.modversion=CyanogenMod-6.1.0-Beta4-Harmony
endif
+#
+# Copy passion specific prebuilt files
+#
PRODUCT_COPY_FILES += \
vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/harmony