Merge remote-tracking branch 'aospal/kitkat-staging' into kitkat-staging
Conflicts:
products/pa_deb.mk
products/pa_grouper.mk
products/pa_maguro.mk
products/pa_mako.mk
products/pa_manta.mk
products/pa_tilapia.mk
products/pa_toro.mk
products/pa_toroplus.mk
diff --git a/configs/bootanimation.mk b/configs/bootanimation.mk
index 52e4e88..8e5b89f 100644
--- a/configs/bootanimation.mk
+++ b/configs/bootanimation.mk
@@ -13,19 +13,19 @@
# limitations under the License.
# Add PA bootanimation based on device resolution
-ifneq ($(filter pa_mako pa_maguro pa_toro pa_toroplus pa_grouper pa_tilapia,$(TARGET_PRODUCT)),)
+ifneq ($(filter psd_mako psd_maguro psd_toro psd_toroplus psd_grouper psd_tilapia,$(TARGET_PRODUCT)),)
PRODUCT_COPY_FILES += \
vendor/pa/prebuilt/bootanimation/1280x720.zip:system/media/bootanimation.zip
endif
-ifeq (pa_hammerhead,$(TARGET_PRODUCT))
+ifeq (psd_hammerhead,$(TARGET_PRODUCT))
PRODUCT_COPY_FILES += \
vendor/pa/prebuilt/bootanimation/1920x1080.zip:system/media/bootanimation.zip
endif
-ifneq ($(filter pa_deb pa_flo,$(TARGET_PRODUCT)),)
+ifneq ($(filter psd_deb psd_flo,$(TARGET_PRODUCT)),)
PRODUCT_COPY_FILES += \
vendor/pa/prebuilt/bootanimation/1920x1200.zip:system/media/bootanimation.zip
endif
-ifeq (pa_manta,$(TARGET_PRODUCT))
+ifeq (psd_manta,$(TARGET_PRODUCT))
PRODUCT_COPY_FILES += \
vendor/pa/prebuilt/bootanimation/2560x1600.zip:system/media/bootanimation.zip
-endif
\ No newline at end of file
+endif
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
deleted file mode 100644
index d7aea1b..0000000
--- a/products/AndroidProducts.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2013 ParanoidAndroid Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ifeq (pa_deb,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_deb.mk
-endif
-ifeq (pa_flo,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_flo.mk
-endif
-ifeq (pa_grouper,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_grouper.mk
-endif
-ifeq (pa_hammerhead,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_hammerhead.mk
-endif
-ifeq (pa_maguro,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_maguro.mk
-endif
-ifeq (pa_mako,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_mako.mk
-endif
-ifeq (pa_manta,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_manta.mk
-endif
-ifeq (pa_tilapia,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_tilapia.mk
-endif
-ifeq (pa_toro,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_toro.mk
-endif
-ifeq (pa_toroplus,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_toroplus.mk
-endif
diff --git a/products/pa_deb.mk b/products/pa_deb.mk
index 89652ea..5d8a350 100644
--- a/products/pa_deb.mk
+++ b/products/pa_deb.mk
@@ -12,9 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Check for target product
-ifeq (pa_deb,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_deb
@@ -23,15 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/asus/deb/full_deb.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_deb
-PRODUCT_BRAND := Google
-PRODUCT_MODEL := Nexus 7
-PRODUCT_MANUFACTURER := Asus
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=razorg BUILD_FINGERPRINT="google/razorg/deb:4.4.2/KOT49H/937116:user/release-keys" PRIVATE_BUILD_DESC="razorg-user 4.4.2 KOT49H 937116 release-keys"
-
-endif
diff --git a/products/pa_flo.mk b/products/pa_flo.mk
index f9cc818..795451f 100644
--- a/products/pa_flo.mk
+++ b/products/pa_flo.mk
@@ -12,9 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Check for target product
-ifeq (pa_flo,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_flo
@@ -23,15 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/asus/flo/full_flo.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_flo
-PRODUCT_BRAND := Google
-PRODUCT_MODEL := Nexus 7
-PRODUCT_MANUFACTURER := Asus
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=razor BUILD_FINGERPRINT="google/razor/flo:4.4.2/KOT49H/937116:user/release-keys" PRIVATE_BUILD_DESC="razor-user 4.4 KOT49H 937116 release-keys"
-
-endif
diff --git a/products/pa_grouper.mk b/products/pa_grouper.mk
index 5db2b41..c1404b0 100644
--- a/products/pa_grouper.mk
+++ b/products/pa_grouper.mk
@@ -12,9 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Check for target product
-ifeq (pa_grouper,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_tvdpi
@@ -23,16 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/asus/grouper/full_grouper.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_grouper
-PRODUCT_BRAND := Google
-PRODUCT_MODEL := Nexus 7
-PRODUCT_MANUFACTURER := Asus
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=nakasi BUILD_FINGERPRINT="google/nakasi/grouper:4.4.2/KOT49H/937116:user/release-keys"
-PRIVATE_BUILD_DESC="nakasi-user 4.4.2 KOT49H 937116 release-keys"
-
-endif
diff --git a/products/pa_hammerhead.mk b/products/pa_hammerhead.mk
index 7491cc9..eddec1a 100644
--- a/products/pa_hammerhead.mk
+++ b/products/pa_hammerhead.mk
@@ -12,10 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Check for target product
-
-ifeq (pa_hammerhead,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -24,15 +20,3 @@
# 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/products/pa_maguro.mk b/products/pa_maguro.mk
index 35dfa33..eddec1a 100644
--- a/products/pa_maguro.mk
+++ b/products/pa_maguro.mk
@@ -12,10 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Check for target product
-
-ifeq (pa_maguro,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -24,15 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/samsung/maguro/full_maguro.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_maguro
-PRODUCT_BRAND := Google
-PRODUCT_MODEL := Galaxy Nexus
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=yakju BUILD_FINGERPRINT="google/yakju/maguro:4.4.2/KOT49H/737497:user/release-keys" PRIVATE_BUILD_DESC="yakju-user 4.4.2 KOT49H 737497 release-keys"
-
-endif
diff --git a/products/pa_mako.mk b/products/pa_mako.mk
index 60302d9..eddec1a 100644
--- a/products/pa_mako.mk
+++ b/products/pa_mako.mk
@@ -12,10 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Check for target product
-
-ifeq (pa_mako,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -24,15 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/lge/mako/full_mako.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_mako
-PRODUCT_BRAND := Google
-PRODUCT_MODEL := Nexus 4
-PRODUCT_MANUFACTURER := LGE
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=occam BUILD_FINGERPRINT=google/occam/mako:4.4.2/KOT49H/937116:user/release-keys PRIVATE_BUILD_DESC="occam-user 4.4.2 KOT49H 937116 release-keys"
-
-endif
diff --git a/products/pa_manta.mk b/products/pa_manta.mk
index ba4b7dd..5c878ba 100644
--- a/products/pa_manta.mk
+++ b/products/pa_manta.mk
@@ -12,9 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Check for target product
-ifeq (pa_manta,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_manta
@@ -23,15 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/samsung/manta/full_manta.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_manta
-PRODUCT_BRAND := google
-PRODUCT_MODEL := Nexus 10
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=mantaray BUILD_FINGERPRINT="google/mantaray/manta:4.4.2/KOT49H/937116:user/release-keys" PRIVATE_BUILD_DESC="mantaray-user 4.4.2 KOT49H 937116 release-keys"
-
-endif
diff --git a/products/pa_tilapia.mk b/products/pa_tilapia.mk
index 237b391..c1404b0 100644
--- a/products/pa_tilapia.mk
+++ b/products/pa_tilapia.mk
@@ -12,9 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Check for target product
-ifeq (pa_tilapia,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_tvdpi
@@ -23,15 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/asus/tilapia/full_tilapia.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_tilapia
-PRODUCT_BRAND := Google
-PRODUCT_MODEL := Nexus 7
-PRODUCT_MANUFACTURER := Asus
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=nakasig BUILD_FINGERPRINT="google/nakasig/tilapia:4.4/KRT16S/920375:user/release-keys" PRIVATE_BUILD_DESC="nakasig-user 4.4 KRT16S 920375 release-keys"
-
-endif
diff --git a/products/pa_toro.mk b/products/pa_toro.mk
index 88dd3b7..eddec1a 100644
--- a/products/pa_toro.mk
+++ b/products/pa_toro.mk
@@ -12,10 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Check for target product
-
-ifeq (pa_toro,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -24,15 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/samsung/toro/full_toro.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_toro
-PRODUCT_BRAND := Google
-PRODUCT_MODEL := Galaxy Nexus
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=mysid BUILD_FINGERPRINT="google/mysid/toro:4.4.2/KOT49H/737497:user/release-keys" PRIVATE_BUILD_DESC="mysid-user 4.4.2 KOT49H 737497 release-keys"
-
-endif
diff --git a/products/pa_toroplus.mk b/products/pa_toroplus.mk
index 403368b..69c6a70 100644
--- a/products/pa_toroplus.mk
+++ b/products/pa_toroplus.mk
@@ -14,8 +14,6 @@
# Check for target product
-ifeq (pa_toroplus,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -24,15 +22,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/samsung/toroplus/full_toroplus.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_toroplus
-PRODUCT_BRAND := Google
-PRODUCT_MODEL := Galaxy Nexus
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=mysidspr BUILD_FINGERPRINT="google/mysidspr/toroplus:4.4.2/KOT49H/737497:user/release-keys" PRIVATE_BUILD_DESC="mysidspr-user 4.4.2 KOT49H 737497 release-keys"
-
-endif