Merge "CM: Add p970 device (LGE Optimus Black)" into gingerbread

products/AndroidProducts.mk

@@ -40,6 +40,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_motus.mk \
     $(LOCAL_DIR)/cyanogen_one.mk \
     $(LOCAL_DIR)/cyanogen_olympus.mk \
+    $(LOCAL_DIR)/cyanogen_p970.mk \
     $(LOCAL_DIR)/cyanogen_p990.mk \
     $(LOCAL_DIR)/cyanogen_p999.mk \
     $(LOCAL_DIR)/cyanogen_passion.mk \

products/cyanogen_p970.mk

@@ -0,0 +1,32 @@
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+# Inherit device configuration
+$(call inherit-product, device/lge/p970/p970.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_p970
+PRODUCT_BRAND := lge
+PRODUCT_DEVICE := p970
+PRODUCT_MODEL := LG-P970
+PRODUCT_MANUFACTURER := LGE
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_bproj BUILD_ID=GRJ22 BUILD_FINGERPRINT="lge/lge_bproj/bproj_EUR-XXX:2.3.4/GRJ22/LG-P970-V20d.421CC761:user/release-keys" PRIVATE_BUILD_DESC="lge_bproj-user 2.3.4 GRJ22 LG-P970-V20d.421CC761 release-keys"
+
+# Release name and versioning
+PRODUCT_RELEASE_NAME := OptimusBlack
+PRODUCT_VERSION_DEVICE_SPECIFIC :=
+-include vendor/cyanogen/products/common_versions.mk
+
+#
+# Copy prebuilt files
+#
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
+
+# Add the Torch app
+#PRODUCT_PACKAGES += Torch

vendorsetup.sh

@@ -39,6 +39,7 @@ add_lunch_combo cyanogen_morrison-eng
 add_lunch_combo cyanogen_motus-eng
 add_lunch_combo cyanogen_one-eng
 add_lunch_combo cyanogen_olympus-eng
+add_lunch_combo cyanogen_p970-eng
 add_lunch_combo cyanogen_p990-eng
 add_lunch_combo cyanogen_p999-eng
 add_lunch_combo cyanogen_passion-eng