Skip to content

Commit

Permalink
harmony: renamed harmony to malata smb_a1002 (GTablet)
Browse files Browse the repository at this point in the history
Change-Id: I2adea07f09ac8b5fd516ec0b3b462ce6ddbbe950
  • Loading branch information
bekriebel authored and rmcc committed May 31, 2011
1 parent d55f5ad commit dc39c81
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.mkdn
Expand Up @@ -27,7 +27,7 @@ Maintainers:
* Geeksphone ZERO: arcee
* Z71 (Boston, G1305, XT502, A60, Blaze, others): arcee
* Wildfire: Jacob Crawley, Arne Coucheron
* NVidia Harmony: bekit, pershoot
* Harmony (Malata smb_a1002): bekit, pershoot
* Ace (Desire HD): Kali-
* Glacier (MT4G): Zinx, Kmobs
* Click (Tattoo): KalimochoAz
Expand Down
2 changes: 1 addition & 1 deletion products/AndroidProducts.mk
Expand Up @@ -18,7 +18,6 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/cyanogen_galaxysmtd.mk \
$(LOCAL_DIR)/cyanogen_generic.mk \
$(LOCAL_DIR)/cyanogen_glacier.mk \
$(LOCAL_DIR)/cyanogen_harmony.mk \
$(LOCAL_DIR)/cyanogen_legend.mk \
$(LOCAL_DIR)/cyanogen_leo.mk \
$(LOCAL_DIR)/cyanogen_liberty.mk \
Expand All @@ -28,6 +27,7 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/cyanogen_p999.mk \
$(LOCAL_DIR)/cyanogen_passion.mk \
$(LOCAL_DIR)/cyanogen_sholes.mk \
$(LOCAL_DIR)/cyanogen_smb_a1002.mk \
$(LOCAL_DIR)/cyanogen_speedy.mk \
$(LOCAL_DIR)/cyanogen_supersonic.mk \
$(LOCAL_DIR)/cyanogen_u8220.mk \
Expand Down
17 changes: 9 additions & 8 deletions products/cyanogen_harmony.mk → products/cyanogen_smb_a1002.mk
@@ -1,35 +1,36 @@
$(call inherit-product, device/nvidia/harmony/device_harmony.mk)
$(call inherit-product, device/malata/smb_a1002/smb_a1002.mk)

# Inherit some common cyanogenmod stuff.
$(call inherit-product, vendor/cyanogen/products/common_full.mk)

#
# Setup device specific product configuration.
#
PRODUCT_NAME := cyanogen_harmony
PRODUCT_NAME := cyanogen_smb_a1002
PRODUCT_BRAND := nvidia
PRODUCT_DEVICE := harmony
PRODUCT_DEVICE := smb_a1002
PRODUCT_MODEL := GTablet
PRODUCT_MANUFACTURER := malata
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=harmony BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1002 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"

# Extra overlay
PRODUCT_PACKAGE_OVERLAYS += \
vendor/cyanogen/overlay/tablet \
vendor/cyanogen/overlay/harmony
vendor/cyanogen/overlay/smb_a1002

#
# Set ro.modversion
#
ifdef CYANOGEN_NIGHTLY
PRODUCT_PROPERTY_OVERRIDES += \
ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Harmony
ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-smb_a1002
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
ro.modversion=CyanogenMod-7.1.0-RC0-Harmony
ro.modversion=CyanogenMod-7.1.0-RC0-smb_a1002
else
PRODUCT_PROPERTY_OVERRIDES += \
ro.modversion=CyanogenMod-7.1.0-RC0-Harmony-KANG
ro.modversion=CyanogenMod-7.1.0-RC0-smb_a1002-KANG
endif
endif

Expand Down
2 changes: 1 addition & 1 deletion vendorsetup.sh
Expand Up @@ -14,7 +14,6 @@ add_lunch_combo cyanogen_espresso-eng
add_lunch_combo cyanogen_galaxysmtd-eng
add_lunch_combo cyanogen_generic-eng
add_lunch_combo cyanogen_glacier-eng
add_lunch_combo cyanogen_harmony-eng
add_lunch_combo cyanogen_hero-eng
add_lunch_combo cyanogen_heroc-eng
add_lunch_combo cyanogen_inc-eng
Expand All @@ -27,6 +26,7 @@ add_lunch_combo cyanogen_p990-eng
add_lunch_combo cyanogen_p999-eng
add_lunch_combo cyanogen_passion-eng
add_lunch_combo cyanogen_sholes-eng
add_lunch_combo cyanogen_smb_a1002-eng
add_lunch_combo cyanogen_speedy-eng
add_lunch_combo cyanogen_supersonic-eng
add_lunch_combo cyanogen_u8220-eng
Expand Down

0 comments on commit dc39c81

Please sign in to comment.