HH: Move fingerprint and other things to vendor/psd
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index d7aea1b..575ceac 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -12,33 +12,33 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ifeq (pa_deb,$(TARGET_PRODUCT))
+ifeq (psd_deb,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_deb.mk
endif
-ifeq (pa_flo,$(TARGET_PRODUCT))
+ifeq (psd_flo,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_flo.mk
endif
-ifeq (pa_grouper,$(TARGET_PRODUCT))
+ifeq (psd_grouper,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_grouper.mk
endif
-ifeq (pa_hammerhead,$(TARGET_PRODUCT))
+ifeq (psd_hammerhead,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_hammerhead.mk
endif
-ifeq (pa_maguro,$(TARGET_PRODUCT))
+ifeq (psd_maguro,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_maguro.mk
endif
-ifeq (pa_mako,$(TARGET_PRODUCT))
+ifeq (psd_mako,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_mako.mk
endif
-ifeq (pa_manta,$(TARGET_PRODUCT))
+ifeq (psd_manta,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_manta.mk
endif
-ifeq (pa_tilapia,$(TARGET_PRODUCT))
+ifeq (psd_tilapia,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_tilapia.mk
endif
-ifeq (pa_toro,$(TARGET_PRODUCT))
+ifeq (psd_toro,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_toro.mk
endif
-ifeq (pa_toroplus,$(TARGET_PRODUCT))
+ifeq (psd_toroplus,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_toroplus.mk
endif
diff --git a/products/pa_hammerhead.mk b/products/pa_hammerhead.mk
index 7491cc9..4d43d33 100644
--- a/products/pa_hammerhead.mk
+++ b/products/pa_hammerhead.mk
@@ -24,15 +24,4 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/lge/hammerhead/full_hammerhead.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_hammerhead
-PRODUCT_BRAND := Google
-PRODUCT_MODEL := Nexus 5
-PRODUCT_MANUFACTURER := LGE
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=hammerhead BUILD_FINGERPRINT="google/hammerhead/hammerhead:4.4.2/KOT49H/937116:user/release-keys" PRIVATE_BUILD_DESC="hammerhead-user 4.4.2 KOT49H 937116 release-keys"
-
endif
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index 4483e0e..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-add_lunch_combo pa_deb-userdebug
-add_lunch_combo pa_grouper-userdebug
-add_lunch_combo pa_flo-userdebug
-add_lunch_combo pa_hammerhead-userdebug
-add_lunch_combo pa_tilapia-userdebug
-add_lunch_combo pa_mako-userdebug
-add_lunch_combo pa_manta-userdebug
-add_lunch_combo pa_maguro-userdebug
-add_lunch_combo pa_toro-userdebug
-add_lunch_combo pa_toroplus-userdebug
-
-# Add the lunch combo here if someone wants odex
-add_lunch_combo pa_hammerhead-user