Cleaning up

Change-Id: Ie0f14c85da66a312902418e735cfe04214901838

dependencies/anzu.dependencies

@@ -6,9 +6,9 @@
         "revision":     "jellybean"
     },
     {
-        "account":      "CyanogenMod",
-        "repository":   "android_device_semc_anzu-common",
-        "target_path":  "device/semc/anzu-common",
+        "account":      "PAC-man",
+        "repository":   "android_device_semc_mogami-common",
+        "target_path":  "device/semc/mogami-common",
         "revision":     "jellybean"
     },
     {

dependencies/coconut.dependencies

@@ -4,7 +4,7 @@
         "repository":   "android_device_semc_coconut",
         "target_path":  "device/semc/coconut",
         "revision":     "jellybean"
-    }
+    },
     {
         "account":      "PAC-man",
         "repository":   "android_device_semc_mogami-common",

dependencies/mango.dependencies

@@ -4,7 +4,7 @@
         "repository":   "android_device_semc_mango",
         "target_path":  "device/semc/mango",
         "revision":     "jellybean"
-    }
+    },
     {
         "account":      "PAC-man",
         "repository":   "android_device_semc_mogami-common",

dependencies/satsuma.dependencies

@@ -4,7 +4,7 @@
         "repository":   "android_device_semc_satsuma",
         "target_path":  "device/semc/satsuma",
         "revision":     "jellybean"
-    }
+    },
     {
         "account":      "PAC-man",
         "repository":   "android_device_semc_mogami-common",

dependencies/smultron.dependencies

@@ -4,7 +4,7 @@
         "repository":   "android_device_semc_smultron",
         "target_path":  "device/semc/smultron",
         "revision":     "jellybean"
-    }
+    },
     {
         "account":      "PAC-man",
         "repository":   "android_device_semc_mogami-common",

products/AndroidProducts.mk

+ifeq (pac_anzu,$(TARGET_PRODUCT))
+    PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_anzu.mk
+endif
+ifeq (pac_cooper,$(TARGET_PRODUCT))
+    PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_cooper.mk
+endif
 ifeq (pac_hercules,$(TARGET_PRODUCT))
     PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_hercules.mk
 endif
+ifeq (pac_i9100,$(TARGET_PRODUCT))
+    PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_i9100.mk
+endif
+ifeq (pac_i9100g,$(TARGET_PRODUCT))
+    PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_i9100g.mk
+endif
 ifeq (pac_mango,$(TARGET_PRODUCT))
     PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_mango.mk
 endif
+ifeq (pac_quincyatt,$(TARGET_PRODUCT))
+    PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_quincyatt.mk
+endif
 ifeq (pac_skyrocket,$(TARGET_PRODUCT))
     PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_skyrocket.mk
 endif
@@ -13,18 +28,6 @@ endif
 ifeq (pac_urushi,$(TARGET_PRODUCT))
     PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_urushi.mk
 endif
-ifeq (pac_i9100,$(TARGET_PRODUCT))
-    PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_i9100.mk
-endif
-ifeq (pac_i9100g,$(TARGET_PRODUCT))
-    PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_i9100g.mk
-endif
-ifeq (pac_quincyatt,$(TARGET_PRODUCT))
-    PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_quincyatt.mk
-endif
-ifeq (pac_cooper,$(TARGET_PRODUCT))
-    PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_cooper.mk
-endif
 ifeq (pac_zeus,$(TARGET_PRODUCT))
     PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_zeus.mk
 endif

products/pac_anzu.mk

 # Check for target product
-ifeq (pac_zeusc,$(TARGET_PRODUCT))
+ifeq (pac_anzu,$(TARGET_PRODUCT))
 
 # OVERLAY_TARGET adds overlay asset source
 OVERLAY_TARGET := pa_hdpi
@@ -10,9 +10,6 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/anzu
 # PAC device overlay
 $(shell cp -f vendor/pac/overlay/pac/sony/hdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
 
-# PA settings overlay
-$(shell cp -f vendor/pac/prebuilt/pa_hdpi.conf vendor/pa/prebuilt/pa_hdpi.conf)
-
 # PAC boot logo
 PRODUCT_COPY_FILES += \
     vendor/pac/prebuilt/common/bootlogo/sony-pac_480x854.rle:root/logo.rle
@@ -25,7 +22,4 @@ $(call inherit-product, device/semc/anzu/cm.mk)
 
 PRODUCT_NAME := pac_anzu
 
-GET_VENDOR_PROPS := $(shell vendor/pac/tools/getvendorprops.py $(PRODUCT_NAME))
-
 endif
-

products/pac_cooper.mk

@@ -8,7 +8,7 @@ OVERLAY_TARGET := pa_mdpi
 PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/cooper
 
 # PAC device overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/pac/samsung/mdpi
+$(shell cp -f vendor/pac/overlay/pac/samsung/mdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
 
 # include ParanoidAndroid common configuration
 include vendor/pac/config/pac_common.mk
@@ -18,6 +18,4 @@ $(call inherit-product, device/samsung/cooper/cm.mk)
 
 PRODUCT_NAME := pac_cooper
 
-GET_VENDOR_PROPS := $(shell vendor/pac/tools/getvendorprops.py $(PRODUCT_NAME))
-
 endif

products/pac_mango.mk

@@ -26,4 +26,3 @@ $(call inherit-product, device/semc/mango/cm.mk)
 PRODUCT_NAME := pac_mango
 
 endif
-

products/pac_quincyatt.mk

@@ -18,6 +18,4 @@ $(call inherit-product, device/samsung/quincyatt/cm.mk)
 
 PRODUCT_NAME := pac_quincyatt
 
-GET_VENDOR_PROPS := $(shell vendor/pa/tools/getvendorprops.py $(PRODUCT_NAME))
-
 endif

products/pac_skyrocket.mk

@@ -18,5 +18,4 @@ $(call inherit-product, device/samsung/skyrocket/cm.mk)
 
 PRODUCT_NAME := pac_skyrocket
 
-
 endif

products/pac_smultron.mk

@@ -23,4 +23,3 @@ $(call inherit-product, device/semc/smultron/cm.mk)
 PRODUCT_NAME := pac_smultron
 
 endif
-

products/pac_urushi.mk

@@ -23,4 +23,3 @@ $(call inherit-product, device/semc/urushi/cm.mk)
 PRODUCT_NAME := pac_urushi
 
 endif
-

products/pac_zeus.mk

@@ -26,4 +26,3 @@ $(call inherit-product, device/semc/zeus/cm.mk)
 PRODUCT_NAME := pac_zeus
 
 endif
-

products/pac_zeusc.mk

@@ -25,7 +25,4 @@ $(call inherit-product, device/semc/zeusc/cm.mk)
 
 PRODUCT_NAME := pac_zeusc
 
-GET_VENDOR_PROPS := $(shell vendor/pac/tools/getvendorprops.py $(PRODUCT_NAME))
-
 endif
-

vendorsetup.sh

@@ -5,14 +5,11 @@ add_lunch_combo pac_smultron-userdebug
 add_lunch_combo pac_urushi-userdebug
 add_lunch_combo pac_zeus-userdebug
 add_lunch_combo pac_zeusc-userdebug
-
 # Galaxy s2 Series
 add_lunch_combo pac_hercules-userdebug
 add_lunch_combo pac_i9100-userdebug
 add_lunch_combo pac_i9100g-userdebug
 add_lunch_combo pac_quincyatt-userdebug
 add_lunch_combo pac_skyrocket-userdebug
-
 # Galaxy Ace
 add_lunch_combo pac_cooper-userdebug
-