Merge "buzz: Add needed prelinker map for updated blobs" into gingerbread
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 6caf3d4..b65bbbe 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -8,6 +8,7 @@
$(LOCAL_DIR)/cyanogen_captivatemtd.mk \
$(LOCAL_DIR)/cyanogen_click.mk \
$(LOCAL_DIR)/cyanogen_coconut.mk \
+ $(LOCAL_DIR)/cyanogen_cooper.mk \
$(LOCAL_DIR)/cyanogen_crespo.mk \
$(LOCAL_DIR)/cyanogen_crespo4g.mk \
$(LOCAL_DIR)/cyanogen_desirec.mk \
@@ -40,6 +41,7 @@
$(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 \
diff --git a/products/cyanogen_cooper.mk b/products/cyanogen_cooper.mk
new file mode 100644
index 0000000..1537d0b
--- /dev/null
+++ b/products/cyanogen_cooper.mk
@@ -0,0 +1,29 @@
+# Inherit AOSP device configuration for blade.
+$(call inherit-product, device/samsung/cooper/device_cooper.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_cooper
+PRODUCT_BRAND := samsung
+PRODUCT_DEVICE := cooper
+PRODUCT_MODEL := GT-S5830
+PRODUCT_MANUFACTURER := Samsung
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=cooper BUILD_ID=GRWK74 BUILD_FINGERPRINT=samsung/GT-S5830/GT-S5830:2.3.4/GINGERBREAD/XXKPH:user/test-keys PRIVATE_BUILD_DESC="GT-S5830-user 2.3.4 GINGERBREAD XXKPH test-keys"
+
+# Release name and versioning
+PRODUCT_RELEASE_NAME := GalaxyAce
+PRODUCT_VERSION_DEVICE_SPECIFIC :=
+-include vendor/cyanogen/products/common_versions.mk
+
+#
+# Copy legend specific prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_p970.mk b/products/cyanogen_p970.mk
new file mode 100644
index 0000000..1ceb907
--- /dev/null
+++ b/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
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 6a304fa..7b16f69 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -7,6 +7,7 @@
add_lunch_combo cyanogen_click-eng
add_lunch_combo cyanogen_captivatemtd-eng
add_lunch_combo cyanogen_coconut-eng
+add_lunch_combo cyanogen_cooper-eng
add_lunch_combo cyanogen_crespo-eng
add_lunch_combo cyanogen_crespo4g-eng
add_lunch_combo cyanogen_desirec-eng
@@ -39,6 +40,7 @@
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