Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy-staging
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b25c15b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/build.sh b/build.sh
index 377ec18..4b6ed4d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,18 @@
#!/bin/bash
-# Version 2.0.4, Adapted for AOSPA.
+# Version 2.0.4, Adapted for AOSPAL.
+
+if [ "pa$1" == "pa" ]
+then
+ echo "Usage: './mk [Device] {Variable}'"
+ echo " Device - your device name"
+ echo " Variable - functions"
+ echo " fix :start build without any cleanning for fix build"
+ echo " clean :run 'make installclean' before build"
+ echo " sync :run 'repo sync' before build"
+ echo " "
+ exit 0
+fi
# We don't allow scrollback buffer
echo -e '\0033\0143'
@@ -36,34 +48,36 @@
JVER=$(javac -version 2>&1 | head -n1 | cut -f2 -d' ')
# Import command line parameters
+THREADS="4"
DEVICE="$1"
-EXTRAS="$2"
# Get build version
-MAJOR=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MAJOR := *' | sed 's/ROM_VERSION_MAJOR := //g')
-MINOR=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MINOR := *' | sed 's/ROM_VERSION_MINOR := //g')
-MAINTENANCE=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MAINTENANCE := *' | sed 's/ROM_VERSION_MAINTENANCE := //g')
-TAG=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_TAG := *' | sed 's/ROM_VERSION_TAG := //g')
+PA_MAJOR=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MAJOR := *' | sed 's/ROM_VERSION_MAJOR := //g')
+PA_MINOR=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MINOR := *' | sed 's/ROM_VERSION_MINOR := //g')
+PA_MAINTENANCE=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_MAINTENANCE := *' | sed 's/ROM_VERSION_MAINTENANCE := //g')
+PA_TAG=$(cat $DIR/vendor/pa/vendor.mk | grep 'ROM_VERSION_TAG := *' | sed 's/ROM_VERSION_TAG := //g')
-if [ -n "$TAG" ]; then
+PSD_MAJOR=$(cat $DIR/vendor/psd/vendor.mk | grep 'PSD_VERSION_MAJOR := *' | sed 's/PSD_VERSION_MAJOR := //g')
+PSD_MINOR=$(cat $DIR/vendor/psd/vendor.mk | grep 'PSD_VERSION_MINOR := *' | sed 's/PSD_VERSION_MINOR := //g')
+PSD_MAINTENANCE=$(cat $DIR/vendor/psd/vendor.mk | grep 'PSD_VERSION_MAINTENANCE := *' | sed 's/PSD_VERSION_MAINTENANCE := //g')
+PSD_TAG=$(cat $DIR/vendor/psd/vendor.mk | grep 'PSD_TYPE := *' | sed 's/PSD_TYPE := //g')
+
+if [ -n "$PA_TAG" ]; then
VERSION=$MAJOR.$MINOR$MAINTENANCE-$TAG
else
VERSION=$MAJOR.$MINOR$MAINTENANCE
fi
-# If there is no extra parameter, reduce parameters index by 1
-if [ "$EXTRAS" == "true" ] || [ "$EXTRAS" == "false" ]; then
- SYNC="$2"
- UPLOAD="$3"
+if [ -n "$PSD_TAG" ]; then
+ PSD_VERSION=$PSD_MAINTENANCE-$PSD_TAG-$PSD_MAJOR.$PSD_MINOR
else
- SYNC="$3"
- UPLOAD="$4"
+ PSD_VERSION=$PSD_MAINTENANCE-$PSD_MAJOR.$PSD_MINOR
fi
# Get start time
res1=$(date +%s.%N)
-echo -e "${cya}Building ${bldcya}AOSPA $VERSION for $DEVICE ${txtrst}";
+echo -e "${cya}Building ${bldcya}AOSPAL $PSD_TAG $PSD_MAJOR.$PSD_MINOR for $DEVICE ${txtrst}";
echo -e "${bldgrn}Start time: $(date) ${txtrst}"
# Decide what command to execute
@@ -97,6 +111,7 @@
JAVA_VERSION="java_version=${JVER}"
fi
+makeme=0
if [ -n "${INTERACTIVE}" ]; then
echo -e "${bldblu}Dropping to interactive shell${txtrst}"
echo -en "${bldblu}Remeber to lunch you device:"
@@ -110,6 +125,10 @@
# Setup environment
echo -e ""
echo -e "${bldblu}Setting up environment${txtrst}"
+ export USE_CCACHE=1
+ export CCACHE_DIR=~/.ccache
+ # set ccache due to your disk space,set it at your own risk
+ prebuilts/misc/linux-x86/ccache/ccache -M 15G
. build/envsetup.sh
echo -e ""
@@ -118,6 +137,44 @@
export PREFS_FROM_SOURCE
lunch "pa_$DEVICE-userdebug";
+ makeme=1
+fi
+
+# Decide what command to execute
+fix_count=0
+for var in $* ; do
+if [ "$var" == "sync" ]
+then
+ echo -e "${bldblu}Fetching latest sources ${txtrst}"
+ repo sync
+ echo -e ""
+elif [ "$var" == "clean" ]
+then
+ echo -e "${bldblu}Clearing previous build info ${txtrst}"
+ mka installclean
+elif [ "$var" == "allclean" ]
+then
+ echo -e "${bldblu}Clearing build path ${txtrst}"
+ mka clean
+elif [ "$var" == "fix" ]
+then
+ echo -e "skip for remove build.prop"
+ fix_count=1
+else
+ echo -e "running..."
+fi
+done
+
+if [ "$fix_count" == "0" ]
+then
+ echo -e "removing build.prop..."
+ rm $OUT/system/build.prop
+fi
+
+echo -e ""
+
+if [ "$makeme" == "1" ]
+then
echo -e "${bldblu}Starting compilation${txtrst}"
mka bacon
fi
diff --git a/configs/bootanimation.mk b/configs/bootanimation.mk
index 0e057ff..2f9430e 100644
--- a/configs/bootanimation.mk
+++ b/configs/bootanimation.mk
@@ -12,30 +12,34 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
# Add PA bootanimation based on xxhdpi xhdpi hdpi tvdpi resolution
+# PA TVDPI Devices
+ifneq ($(filter psd_n5110 psd_pollux_windy,$(TARGET_PRODUCT)),)
+ PRODUCT_COPY_FILES += \
+ vendor/pa/prebuilt/bootanimation/1920x1200.zip:system/media/bootanimation.zip
+endif
# PA XXHDPI Devices
-ifneq ($(filter pa_bacon pa_d800 pa_d801 pa_d802 pa_d803 pa_dlx pa_hlte pa_honami pa_find5 pa_find7 pa_i9500 pa_jflte pa_ls980 pa_m7 pa_m7spr pa_m7vzw pa_m8 pa_n1 pa_odin pa_vs980 pa_yuga,$(TARGET_PRODUCT)),)
+ifneq ($(filter psd_bacon psd_d800 psd_d801 psd_d802 psd_d803 psd_dlx psd_hlte psd_honami psd_find5 psd_find7 psd_i9500 psd_jflte psd_ls980 psd_m7 psd_m7spr psd_m7vzw psd_m8 psd_n1 psd_odin psd_vs980 psd_yuga,$(TARGET_PRODUCT)),)
PRODUCT_COPY_FILES += \
vendor/pa/prebuilt/bootanimation/1920x1080.zip:system/media/bootanimation.zip
endif
# PA XHDPI Devices
-ifneq ($(filter pa_edison pa_maserasti pa_spyder pa_targa pa_umts_spyder pa_hikari pa_nozomi pa_tate pa_jem pa_jemlte pa_falcon pa_enrc2b pa_mint pa_melius3gxx pa_meliusltexx pa_evita pa_moto_msm8960 pa_moto_msm8960dt pa_d2lte pa_gee pa_geeb pa_hercules pa_i605 pa_i9300 pa_l900 pa_m4 pa_n7000 pa_n7100 pa_p880 pa_skyrocket pa_tf201 pa_togari pa_v500,$(TARGET_PRODUCT)),)
+ifneq ($(filter psd_edison psd_maserasti psd_spyder psd_targa psd_umts_spyder psd_hikari psd_nozomi psd_jewel psd_tate psd_jem psd_jemlte psd_enrc2b psd_evita psd_falcon psd_melius3gxx psd_meliusltexx psd_mint psd_moto_msm8960 psd_moto_msm8960dt psd_d2lte psd_gee psd_geeb psd_hercules psd_i605 psd_i9300 psd_l900 psd_m4 psd_n7000 psd_n7100 psd_p880 psd_skyrocket psd_tf201 psd_togari psd_v500,$(TARGET_PRODUCT)),)
PRODUCT_COPY_FILES += \
vendor/pa/prebuilt/bootanimation/1280x720.zip:system/media/bootanimation.zip
endif
# PA HDPI Devices
-ifneq ($(filter pa_galaxysmtd pa_i9082 pa_i9100 pa_i9100g pa_p3100 pa_p3110 pa_serrano3gxx pa_serranoltexx pa_ville,$(TARGET_PRODUCT)),)
+ifneq ($(filter psd_galaxysmtd psd_i9100 psd_i9100g psd_p3100 psd_haida psd_p3110 psd_serrano3gxx psd_serranoltexx psd_taoshan psd_ville,$(TARGET_PRODUCT)),)
PRODUCT_COPY_FILES += \
vendor/pa/prebuilt/bootanimation/800x480.zip:system/media/bootanimation.zip
endif
# PA TVDPI Devices
-ifneq ($(filter pa_a510 pa_a700 pa_n5100 pa_n5110 pa_n5120,$(TARGET_PRODUCT)),)
+ifneq ($(filter psd_a510 psd_a700 psd_n5100 psd_n5110 psd_n5120,$(TARGET_PRODUCT)),)
PRODUCT_COPY_FILES += \
vendor/pa/prebuilt/bootanimation/1920x1200.zip:system/media/bootanimation.zip
endif
diff --git a/main.mk b/main.mk
index e319ddf..46bc762 100644
--- a/main.mk
+++ b/main.mk
@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
-
include vendor/pa/vendor.mk
include vendor/pa/configs/aosp_fixes.mk
include vendor/pa/configs/system.mk
@@ -22,4 +20,3 @@
include vendor/pa/configs/version.mk
include vendor/pa/configs/legacy_extras.mk
include vendor/pa/configs/themes_common.mk
-#include vendor/pa/sepolicy/sepolicy.mk
diff --git a/prebuilt/bin/backuptool.functions b/prebuilt/bin/backuptool.functions
index ff96b21..0e6b4aa 100755
--- a/prebuilt/bin/backuptool.functions
+++ b/prebuilt/bin/backuptool.functions
@@ -11,14 +11,9 @@
if [ -e "$1" ]; then
local F=`basename "$1"`
local D=`dirname "$1"`
- # dont backup any apps that have odex files, they are useless
- if ( echo "$F" | grep -q "\.apk$" ) && [ -e `echo "$1" | sed -e 's/\.apk$/\.odex/'` ]; then
- echo "Skipping odexed apk $1";
- else
mkdir -p "$C/$D"
cp -p $1 "$C/$D/$F"
fi
- fi
}
restore_file() {
diff --git a/prebuilt/etc/init.d/90userinit b/prebuilt/etc/init.d/90userinit
old mode 100755
new mode 100644
index 7012a2c..2cf122a
--- a/prebuilt/etc/init.d/90userinit
+++ b/prebuilt/etc/init.d/90userinit
@@ -10,4 +10,4 @@
if [ -d /data/local/userinit.d ];
then
logwrapper busybox run-parts /data/local/userinit.d;
-fi;
+fi;
\ No newline at end of file
diff --git a/prebuilt/etc/init.pa.rc b/prebuilt/etc/init.pa.rc
index bfe2a8b..8aaa16f 100644
--- a/prebuilt/etc/init.pa.rc
+++ b/prebuilt/etc/init.pa.rc
@@ -84,11 +84,11 @@
# Assume SMP uses shared cpufreq policy for all CPUs
chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
- chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+ chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
- chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
+ chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
- chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+ chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
# I/O scheduler
chown system system /sys/block/mmcblk0/queue/scheduler
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
deleted file mode 100644
index f61b306..0000000
--- a/products/AndroidProducts.mk
+++ /dev/null
@@ -1,221 +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_a510,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_a510.mk
-endif
-ifeq (pa_a700,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_a700.mk
-endif
-ifeq (pa_d2lte,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_d2lte.mk
-endif
-ifeq (pa_bacon,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_bacon.mk
-endif
-ifeq (pa_d800,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_d800.mk
-endif
-ifeq (pa_d801,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_d801.mk
-endif
-ifeq (pa_d802,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_d802.mk
-endif
-ifeq (pa_d803,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_d803.mk
-endif
-ifeq (pa_dlx,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_dlx.mk
-endif
-ifeq (pa_edison,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_edison.mk
-endif
-ifeq (pa_enrc2b,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_enrc2b.mk
-endif
-ifeq (pa_evita,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_evita.mk
-endif
-ifeq (pa_falcon,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_falcon.mk
-endif
-ifeq (pa_find5,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_find5.mk
-endif
-ifeq (pa_find7,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_find7.mk
-endif
-ifeq (pa_flo,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_flo.mk
-endif
-ifeq (pa_galaxysmtd,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_galaxysmtd.mk
-endif
-ifeq (pa_gee,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_gee.mk
-endif
-ifeq (pa_geeb,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_geeb.mk
-endif
-ifeq (pa_hercules,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_hercules.mk
-endif
-ifeq (pa_hikari,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_hikari.mk
-endif
-ifeq (pa_hlte,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_hlte.mk
-endif
-ifeq (pa_honami,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_honami.mk
-endif
-ifeq (pa_i605,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_i605.mk
-endif
-ifeq (pa_i9082,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_i9082.mk
-endif
-ifeq (pa_i9100,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_i9100.mk
-endif
-ifeq (pa_i9100g,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_i9100g.mk
-endif
-ifeq (pa_i9300,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_i9300.mk
-endif
-ifeq (pa_i9500,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_i9500.mk
-endif
-ifeq (pa_jem,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_jem.mk
-endif
-ifeq (pa_jemlte,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_jemlte.mk
-endif
-ifeq (pa_jflte,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_jflte.mk
-endif
-ifeq (pa_l900,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_l900.mk
-endif
-ifeq (pa_ls980,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_ls980.mk
-endif
-ifeq (pa_m4,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_m4.mk
-endif
-ifeq (pa_m7,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_m7.mk
-endif
-ifeq (pa_m7spr,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_m7spr.mk
-endif
-ifeq (pa_m7vzw,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_m7vzw.mk
-endif
-ifeq (pa_m8,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_m8.mk
-endif
-ifeq (pa_maserati,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_maserati.mk
-endif
-ifeq (pa_melius3gxx,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_melius3gxx.mk
-endif
-ifeq (pa_meliusltexx,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_meliusltexx.mk
-endif
-ifeq (pa_mint,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_mint.mk
-endif
-ifeq (pa_moto_msm8960,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_moto_msm8960.mk
-endif
-ifeq (pa_moto_msm8960dt,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_moto_msm8960dt.mk
-endif
-ifeq (pa_n1,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_n1.mk
-endif
-ifeq (pa_n5100,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_n5100.mk
-endif
-ifeq (pa_n5110,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_n5110.mk
-endif
-ifeq (pa_n5120,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_n5120.mk
-endif
-ifeq (pa_n7000,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_n7000.mk
-endif
-ifeq (pa_n7100,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_n7100.mk
-endif
-ifeq (pa_nozomi,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_nozomi.mk
-endif
-ifeq (pa_odin,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_odin.mk
-endif
-ifeq (pa_p3100,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_p3100.mk
-endif
-ifeq (pa_p3110,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_p3110.mk
-endif
-ifeq (pa_p880,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_p880.mk
-endif
-ifeq (pa_serrano3gxx,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_serrano3gxx.mk
-endif
-ifeq (pa_serranoltexx,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_serranoltexx.mk
-endif
-ifeq (pa_skyrocket,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_skyrocket.mk
-endif
-ifeq (pa_spyder,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_spyder.mk
-endif
-ifeq (pa_targa,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_targa.mk
-endif
-ifeq (pa_tate,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_tate.mk
-endif
-ifeq (pa_tf201,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_tf201.mk
-endif
-ifeq (pa_togari,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_togari.mk
-endif
-ifeq (pa_umts_spyder,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_umts_spyder.mk
-endif
-ifeq (pa_v500,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_v500.mk
-endif
-ifeq (pa_ville,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_ville.mk
-endif
-ifeq (pa_vs980,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_vs980.mk
-endif
-ifeq (pa_yuga,$(TARGET_PRODUCT))
- PRODUCT_MAKEFILES += $(LOCAL_DIR)/pa_yuga.mk
-endif
diff --git a/products/pa_a510.mk b/products/pa_a510.mk
index 77daf32..ff01c1c 100644
--- a/products/pa_a510.mk
+++ b/products/pa_a510.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_a510,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_mdpi
@@ -26,16 +23,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/acer/a510/full_a510.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_a510
-PRODUCT_DEVICE := a510
-PRODUCT_BRAND := Acer
-PRODUCT_MODEL := A510
-PRODUCT_MANUFACTURER := acer
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=a510_pa_cus1 TARGET_DEVICE=picasso_m BUILD_FINGERPRINT="acer/a510_pa_cus1/picasso_m:4.1.2/JZO54K/1354108731:user/release-keys" PRIVATE_BUILD_DESC="a510_pa_cus1-user 4.1.2 JZ054K 1354108731 release-keys"
-
-endif
diff --git a/products/pa_a700.mk b/products/pa_a700.mk
index dadad0c..b35c7ab 100644
--- a/products/pa_a700.mk
+++ b/products/pa_a700.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_a700,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_hdpi
@@ -26,16 +23,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/acer/a700/full_a700.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_a700
-PRODUCT_DEVICE := a700
-PRODUCT_BRAND := Acer
-PRODUCT_MODEL := A700
-PRODUCT_MANUFACTURER := acer
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=a700_emea_cus1 TARGET_DEVICE=picasso_mf BUILD_FINGERPRINT="acer/a700_emea_cus1/picasso_mf:4.0.4/IMM76D/1337332281:user/release-keys" PRIVATE_BUILD_DESC="a700_emea_cus1-user 4.0.4 IMM76D 1337332281 release-keys"
-
-endif
diff --git a/products/pa_bacon.mk b/products/pa_bacon.mk
index cf427a5..93c0374 100644
--- a/products/pa_bacon.mk
+++ b/products/pa_bacon.mk
@@ -14,8 +14,6 @@
# Check for target product
-ifeq (pa_bacon,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xxhdpi
@@ -27,18 +25,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/oneplus/bacon/full_bacon.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_bacon
-PRODUCT_DEVICE := bacon
-PRODUCT_BRAND := Oneplus
-PRODUCT_MODEL := One
-PRODUCT_MANUFACTURER := Oneplus
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=bacon TARGET_DEVICE=bacon
-
-endif
diff --git a/products/pa_d2lte.mk b/products/pa_d2lte.mk
index 0485a38..d5cc290 100644
--- a/products/pa_d2lte.mk
+++ b/products/pa_d2lte.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_d2lte,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,18 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/d2lte/full_d2lte.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_d2lte
-PRODUCT_DEVICE := d2lte
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := d2lte
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=d2lte TARGET_DEVICE=d2lte
-
-endif
diff --git a/products/pa_d800.mk b/products/pa_d800.mk
index 643798a..66c1935 100644
--- a/products/pa_d800.mk
+++ b/products/pa_d800.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_d800,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_g2
@@ -27,17 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/lge/d800/d800.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := d800
-PRODUCT_NAME := pa_d800
-PRODUCT_BRAND := LGE
-PRODUCT_MODEL := LG-D800
-PRODUCT_MANUFACTURER := lge
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=d800 BUILD_FINGERPRINT=lge/g2_att_us/g2:4.4.2/KOT49I.D80020c/D80020c.1391309241:user/release-keys PRIVATE_BUILD_DESC="g2_att_us-user 4.4.2 KOT49I.D80020c D80020c.1391309241 release-keys"
-
-endif
diff --git a/products/pa_d801.mk b/products/pa_d801.mk
index 9e35fb1..66c1935 100644
--- a/products/pa_d801.mk
+++ b/products/pa_d801.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_d801,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_g2
@@ -27,17 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/lge/d801/d801.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := d801
-PRODUCT_NAME := pa_d801
-PRODUCT_BRAND := LGE
-PRODUCT_MODEL := LG-D801
-PRODUCT_MANUFACTURER := lge
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=d801 BUILD_FINGERPRINT=lge/g2_tmo_us/g2:4.4.2/KOT49I.D80120a/D80120a.1391414342:user/release-keys PRIVATE_BUILD_DESC="g2_tmo_us-user 4.4.2 KOT49I.D80120a D80120a.1391414342 release-keys"
-
-endif
diff --git a/products/pa_d802.mk b/products/pa_d802.mk
index 02aad2e..66c1935 100644
--- a/products/pa_d802.mk
+++ b/products/pa_d802.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_d802,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_g2
@@ -27,17 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/lge/d802/d802.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := d802
-PRODUCT_NAME := pa_d802
-PRODUCT_BRAND := LGE
-PRODUCT_MODEL := LG-D802
-PRODUCT_MANUFACTURER := lge
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=d802 BUILD_FINGERPRINT=lge/g2_open_com/g2:4.4.2/KOT49I.D80220a/D80220a.1392133741:user/release-keys PRIVATE_BUILD_DESC="g2_open_com-user 4.4.2 KOT49I.D80220a D80220a.1392133741 release-keys"
-
-endif
diff --git a/products/pa_d803.mk b/products/pa_d803.mk
index c4e9f7c..66c1935 100644
--- a/products/pa_d803.mk
+++ b/products/pa_d803.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_d803,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_g2
@@ -27,17 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/lge/d803/d803.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := d803
-PRODUCT_NAME := pa_d803
-PRODUCT_BRAND := LGE
-PRODUCT_MODEL := LG-D803
-PRODUCT_MANUFACTURER := lge
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=d803 BUILD_FINGERPRINT=lge/g2_ca/g2:4.4.2/KOT49I.D803B20e/D803B20e.1394602420:user/release-keys PRIVATE_BUILD_DESC="g2_ca-user 4.4.2 KOT49I.D803B20e D803B20e.1394602420 release-keys"
-
-endif
diff --git a/products/pa_dlx.mk b/products/pa_dlx.mk
index 25a719f..ca3f689 100644
--- a/products/pa_dlx.mk
+++ b/products/pa_dlx.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_dlx,$(TARGET_PRODUCT))
-
# Define PA bootanimation size
PARANOID_BOOTANIMATION_NAME := XHDPI
@@ -29,20 +26,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/htc/dlx/full_dlx.mk)
-
-# Override AOSP build properties
-PRODUCT_DEVICE := dlx
-PRODUCT_NAME := pa_dlx
-PRODUCT_BRAND := Verizon
-PRODUCT_MODEL := HTC6435LVW
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=dlx \
- BUILD_ID=JDQ39 \
- BUILD_FINGERPRINT=htc/verizon_wwe/dlx:4.2.2/JDQ39/277065.4:user/release-keys \
- PRIVATE_BUILD_DESC="3.06.605.4 CL277065 release-keys"
-
-endif
diff --git a/products/pa_e975.mk b/products/pa_e975.mk
new file mode 100644
index 0000000..c843729
--- /dev/null
+++ b/products/pa_e975.mk
@@ -0,0 +1,28 @@
+# 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.
+
+# Define PA bootanimation size
+PARANOID_BOOTANIMATION_NAME := XHDPI
+
+# OVERLAY_TARGET adds overlay asset source
+OVERLAY_TARGET := pa_xhdpi
+
+# Build paprefs from sources
+PREFS_FROM_SOURCE ?= false
+
+# Inherit telephony common stuff
+$(call inherit-product, vendor/pa/configs/telephony.mk)
+
+# Include AOSPA common configuration
+include vendor/pa/main.mk
diff --git a/products/pa_edison.mk b/products/pa_edison.mk
index 8362aaa..baa7c28 100644
--- a/products/pa_edison.mk
+++ b/products/pa_edison.mk
@@ -11,9 +11,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Check for target product
-ifeq (pa_edison,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -25,16 +22,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/motorola/edison/full_edison.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_edison
-PRODUCT_BRAND := Motorola
-PRODUCT_DEVICE := edison
-PRODUCT_MODEL := MB865
-PRODUCT_MANUFACTURER := Motorola
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MB865_att TARGET_DEVICE=edison BUILD_FINGERPRINT="motorola/MB865_att/edison:4.0.4/6.7.2-226-EDICS-10/67.21.125:user/release-keys" PRIVATE_BUILD_DESC="edison-user 4.0.4 6.7.2-226-EDICS-10 67.21.125 release-keys"
-
-endif
diff --git a/products/pa_enrc2b.mk b/products/pa_enrc2b.mk
index f524471..d5cc290 100644
--- a/products/pa_enrc2b.mk
+++ b/products/pa_enrc2b.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_enrc2b,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,19 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/htc/enrc2b/full_enrc2b.mk)
-
-# Override AOSP build properties
-PRODUCT_DEVICE := enrc2b
-PRODUCT_NAME := pa_enrc2b
-PRODUCT_BRAND := htc_europe
-PRODUCT_MODEL := One X+
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=enrc2b \
- BUILD_FINGERPRINT="htc_europe/enrc2b/enrc2b:4.3/JRO03C/125529.22:user/release-keys" \
- PRIVATE_BUILD_DESC="3.14.401.22 CL125529 release-keys"
-
-endif
diff --git a/products/pa_evita.mk b/products/pa_evita.mk
index 0afe2cb..8ac717c 100644
--- a/products/pa_evita.mk
+++ b/products/pa_evita.mk
@@ -1,8 +1,6 @@
# Release name
PRODUCT_RELEASE_NAME := evita
-ifeq (pa_evita,$(TARGET_PRODUCT))
-
# Define PA bootanimation size
PARANOID_BOOTANIMATION_NAME := XHDPI
@@ -17,18 +15,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/htc/evita/device.mk)
-
-# Device naming
-PRODUCT_NAME := pa_evita
-PRODUCT_DEVICE := evita
-PRODUCT_BRAND := htc
-PRODUCT_MODEL := One X
-PRODUCT_MANUFACTURER := HTC
-
-# Set build fingerprint / ID / Product Name etc.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_evita BUILD_FINGERPRINT=cingular_us/evita/evita:4.1.1/JRO03C/131981.6:user/release-keys PRIVATE_BUILD_DESC="3.18.502.6 CL131981 release-keys" BUILD_NUMBER=79936
-
-endif
diff --git a/products/pa_falcon.mk b/products/pa_falcon.mk
index d1f5804..d5cc290 100644
--- a/products/pa_falcon.mk
+++ b/products/pa_falcon.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_falcon,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,18 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/motorola/falcon/full_falcon.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_falcon
-PRODUCT_DEVICE := falcon
-PRODUCT_BRAND := motorola
-PRODUCT_MANUFACTURER := motorola
-PRODUCT_MODEL := falcon
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=falcon TARGET_DEVICE=falcon
-
-endif
diff --git a/products/pa_find5.mk b/products/pa_find5.mk
index 4924843..056d02f 100644
--- a/products/pa_find5.mk
+++ b/products/pa_find5.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_find5,$(TARGET_PRODUCT))
-
# Define PA bootanimation size
PARANOID_BOOTANIMATION_NAME := XXHDPI
@@ -29,16 +26,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/oppo/find5/full_find5.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_find5
-PRODUCT_BRAND := Oppo
-PRODUCT_MODEL := Find 5
-PRODUCT_MANUFACTURER := Oppo
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=occam BUILD_FINGERPRINT=OPPO/oppo_12069/FIND5:4.1.1/JRO03L/1362469752:user/release-keys PRIVATE_BUILD_DESC="msm8960-user 4.1.1 JRO03L eng.oppo.20130328.172033 release-keys"
-PRIVATE_BUILD_DESC="nakasi-user 4.2 JOP40C 527662 release-keys"
-
-endif
diff --git a/products/pa_find7.mk b/products/pa_find7.mk
index 2974552..f2347af 100644
--- a/products/pa_find7.mk
+++ b/products/pa_find7.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_find7,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xxhdpi
@@ -27,22 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/oppo/find7/full_find7.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_find7
-PRODUCT_DEVICE := find7
-PRODUCT_BRAND := OPPO
-PRODUCT_MANUFACTURER := OPPO
-PRODUCT_MODEL := find7
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += \
- BUILD_PRODUCT=find7 \
- TARGET_DEVICE=find7 \
- BUILD_FINGERPRINT="4.3/JLS36C/1390465867:user/release-keys" \
- PRIVATE_BUILD_DESC="msm8974-user 4.3 JLS36C eng.root.20140510.152835 release-keys"
-
-endif
diff --git a/products/pa_flo.mk b/products/pa_flo.mk
index 047666c..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,19 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/asus/flo/full_flo.mk)
-
-# Include ParanoidAndroid bootanimation
-PRODUCT_COPY_FILES += \
- vendor/pa/prebuilt/bootanimation/1920x1080.zip:system/media/bootanimation.zip
-
-# 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_galaxysmtd.mk b/products/pa_galaxysmtd.mk
index c5d9ccc..85aa482 100644
--- a/products/pa_galaxysmtd.mk
+++ b/products/pa_galaxysmtd.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_galaxysmtd,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_hdpi
@@ -26,16 +22,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/galaxysmtd/full_galaxysmtd.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_galaxysmtd
-PRODUCT_DEVICE := galaxysmtd
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9000
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9000 TARGET_DEVICE=GT-I9000 BUILD_FINGERPRINT=samsung/GT-I9000/GT-I9000:2.3.5/GINGERBREAD/XXJVT:user/release-keys PRIVATE_BUILD_DESC="GT-I9000-user 2.3.5 GINGERBREAD XXJVT release-keys"
-
-endif
diff --git a/products/pa_gee.mk b/products/pa_gee.mk
index ef5e77e..9d06aa1 100644
--- a/products/pa_gee.mk
+++ b/products/pa_gee.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_gee,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,17 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/lge/gee/full_gee.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_gee
-PRODUCT_DEVICE := gee
-PRODUCT_BRAND := LGE
-PRODUCT_MANUFACTURER := LGE
-PRODUCT_MODEL := Optimus G
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=gee BUILD_FINGERPRINT="lge/gee/gee:4.4.2/KOT49H/937116:user/release-keys" PRIVATE_BUILD_DESC="gee-user 4.4.2 KOT49H 937116 release-keys"
-
-endif
diff --git a/products/pa_geeb.mk b/products/pa_geeb.mk
index 4f05264..9d06aa1 100644
--- a/products/pa_geeb.mk
+++ b/products/pa_geeb.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_geeb,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,17 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/lge/geeb/full_geeb.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_geeb
-PRODUCT_DEVICE := geeb
-PRODUCT_BRAND := LGE
-PRODUCT_MANUFACTURER := LGE
-PRODUCT_MODEL := Optimus G
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=geeb BUILD_FINGERPRINT="lge/gee/geeb:4.4.2/KOT49H/937116:user/release-keys" PRIVATE_BUILD_DESC="gee-user 4.4.2 KOT49H 937116 release-keys"
-
-endif
diff --git a/products/pa_haida.mk b/products/pa_haida.mk
new file mode 100644
index 0000000..bed2702
--- /dev/null
+++ b/products/pa_haida.mk
@@ -0,0 +1,24 @@
+# Copyright (C) 2014 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.
+
+# OVERLAY_TARGET adds overlay asset source
+OVERLAY_TARGET := pa_hdpi
+
+PREFS_FROM_SOURCE ?= false
+
+# Inherit telephony common stuff
+$(call inherit-product, vendor/pa/configs/telephony.mk)
+
+# Include AOSPA common configuration
+include vendor/pa/main.mk
diff --git a/products/pa_hercules.mk b/products/pa_hercules.mk
index 9cf6c2e..b9bea3d 100644
--- a/products/pa_hercules.mk
+++ b/products/pa_hercules.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_hercules,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_hercules
@@ -26,15 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/samsung/hercules/full_hercules.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_hercules
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SGH-T989
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-T989 TARGET_DEVICE=SGH-T989 BUILD_FINGERPRINT="samsung/SGH-T989/SGH-T989:4.4/KRT16M/T989UVMC6:user/release-keys" PRIVATE_BUILD_DESC="SGH-T989-user 4.4 KRT16M UVMC6 release-keys"
-
-endif
diff --git a/products/pa_hikari.mk b/products/pa_hikari.mk
index 0411586..fa7c442 100644
--- a/products/pa_hikari.mk
+++ b/products/pa_hikari.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_hikari,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,16 +22,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/sony/hikari/full_hikari.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_hikari
-PRODUCT_DEVICE := hikari
-PRODUCT_BRAND := Sony
-PRODUCT_MANUFACTURER := Sony
-PRODUCT_MODEL := Xperia Acro S
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=LT26w_1266-3204 PRODUCT_DEVICE=hikari BUILD_FINGERPRINT=SEMC/LT26w_1266-3204/LT26w:4.0.4/6.1.A.2.50/zfd_zw:user/release-keys PRIVATE_BUILD_DESC="LT26w-user 4.0.4 6.1.A.2.50 zfd_zw test-keys"
-
-endif
diff --git a/products/pa_hlte.mk b/products/pa_hlte.mk
index 46974c4..c6964b8 100644
--- a/products/pa_hlte.mk
+++ b/products/pa_hlte.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_hlte,$(TARGET_PRODUCT))
-
# Define PA bootanimation size
PARANOID_BOOTANIMATION_NAME := XHDPI
@@ -29,15 +26,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/hlte/full_hlte.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_hlte
-PRODUCT_DEVICE := hlte
-PRODUCT_BRAND := Samsung
-PRODUCT_MODEL := SM-N9005
-PRODUCT_MANUFACTURER := Samsung
-endif
-
diff --git a/products/pa_honami.mk b/products/pa_honami.mk
index d21a61f..d5cc290 100644
--- a/products/pa_honami.mk
+++ b/products/pa_honami.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_honami,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,16 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/sony/honami/full_honami.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_honami
-PRODUCT_DEVICE := honami
-PRODUCT_BRAND := sony
-PRODUCT_MANUFACTURER := Sony
-PRODUCT_MODEL := Xperia Z1
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=C6903 TARGET_DEVICE=honami BUILD_FINGERPRINT=Sony/C6903/C6903:4.3/14.2.A.0.290/eng.hudsonslave:user/release-keys PRIVATE_BUILD_DESC="C6903-user 4.3 RHINE-1.1-131125-1201 eng.hudsonslave test-keys"
-
-endif
diff --git a/products/pa_i605.mk b/products/pa_i605.mk
index 4753d69..b108bf7 100644
--- a/products/pa_i605.mk
+++ b/products/pa_i605.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_i605,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,20 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/i605/full_i605.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := i605
-PRODUCT_NAME := pa_i605
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SCH-I605
-PRODUCT_MANUFACTURER := samsung
-
-PRODUCT_GMS_CLIENTID_BASE := android-verizon
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=t0ltevzw TARGET_DEVICE=t0ltevzw BUILD_FINGERPRINT="Verizon/t0ltevzw/t0ltevzw:4.3/JSS15J/I605VRUEMJ9:user/release-keys" PRIVATE_BUILD_DESC="t0ltevzw-user 4.3 JSS15J I605VRUEMJ9 release-keys"
-
-endif
diff --git a/products/pa_i9082.mk b/products/pa_i9082.mk
index 650f71a..05aae5a 100644
--- a/products/pa_i9082.mk
+++ b/products/pa_i9082.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_i9082,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_hdpi
@@ -26,16 +23,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/samsung/i9082/full_i9082.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_i9082
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9082
-
-#Set build fingerprint / ID / Prduct Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=baffinvj TARGET_DEVICE=baffin BUILD_FINGERPRINT=samsung/baffinvj/baffin:4.1.2/JZO54K/I9082LDCAMC2:user/release-keys PRIVATE_BUILD_DESC="baffinvj-user 4.1.2 JZO54K I9082LDCAMC2 release-keys"
-endif
diff --git a/products/pa_i9100.mk b/products/pa_i9100.mk
index fc429bb..85aa482 100644
--- a/products/pa_i9100.mk
+++ b/products/pa_i9100.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_i9100,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_hdpi
@@ -26,17 +22,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/i9100/full_i9100.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_i9100
-PRODUCT_DEVICE := i9100
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9100
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=GT-I9100 TARGET_DEVICE=GT-I9100 BUILD_FINGERPRINT=samsung/GT-I9100/GT-I9100:4.0.3/IML74K/XXLPQ:user/release-keys PRIVATE_BUILD_DESC="GT-I9100-user 4.0.3 IML74K XXLPQ release-keys"
-
-endif
\ No newline at end of file
diff --git a/products/pa_i9100g.mk b/products/pa_i9100g.mk
index 433c9c4..85aa482 100644
--- a/products/pa_i9100g.mk
+++ b/products/pa_i9100g.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_i9100g,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_hdpi
@@ -26,17 +22,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/i9100g/full_i9100g.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_i9100g
-PRODUCT_DEVICE := i9100g
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9100G
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=GT-I9100G TARGET_DEVICE=GT-I9100G BUILD_FINGERPRINT=samsung/GT-I9100G/GT-I9100G:4.1.2/JZO54K/I9100GXXLSR:user/release-keys PRIVATE_BUILD_DESC="GT-I9100G-user 4.1.2 JZO54K I9100GXXLSR release-keys"
-
-endif
diff --git a/products/pa_i9300.mk b/products/pa_i9300.mk
index be06e7e..fa7c442 100644
--- a/products/pa_i9300.mk
+++ b/products/pa_i9300.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_i9300,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,20 +22,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/i9300/full_i9300.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_i9300
-PRODUCT_DEVICE := i9300
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9300
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=m0xx \
- TARGET_DEVICE=m0 \
- BUILD_FINGERPRINT="samsung/m0xx/m0:4.3/JSS15J/I9300XXUGMJ9:user/release-keys" \
- PRIVATE_BUILD_DESC="m0xx-user 4.3 JSS15J I9300XXUGMJ9 release-keys"
-
-endif
diff --git a/products/pa_i9500.mk b/products/pa_i9500.mk
index de81413..0e66d4a 100644
--- a/products/pa_i9500.mk
+++ b/products/pa_i9500.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_i9500,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,16 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/i9500/full_i9500.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_i9500
-PRODUCT_DEVICE := i9500
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9500
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ja3gxx TARGET_DEVICE=ja3g BUILD_FINGERPRINT="samsung/ja3gxx/ja3g:4.4.2/KOT49H/I9500XXUFNB3:user/release-keys" PRIVATE_BUILD_DESC="ja3gxx-user 4.4.2 KOT49H I9500XXUFNB3 release-keys"
-
-endif
diff --git a/products/pa_jem.mk b/products/pa_jem.mk
index 0c2cf45..c1404b0 100644
--- a/products/pa_jem.mk
+++ b/products/pa_jem.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_jem,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_tvdpi
@@ -23,19 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/amazon/jem/full_jem.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_jem
-PRODUCT_DEVICE := jem
-PRODUCT_RELEASE_NAME := KindleFireHD
-PRODUCT_BRAND := google
-PRODUCT_MODEL := Amazon Jem
-PRODUCT_MANUFACTURER := android
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=jem TARGET_DEVICE=jem
-
-endif
diff --git a/products/pa_jemlte.mk b/products/pa_jemlte.mk
index 0916f7a..68d9b0b 100644
--- a/products/pa_jemlte.mk
+++ b/products/pa_jemlte.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_jemlte,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_tvdpi
@@ -26,19 +23,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/amazon/jemlte/full_jemlte.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_jemlte
-PRODUCT_DEVICE := jemlte
-PRODUCT_RELEASE_NAME := KindleFireHD
-PRODUCT_BRAND := google
-PRODUCT_MODEL := Amazon Jem LTE
-PRODUCT_MANUFACTURER := android
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=jemlte TARGET_DEVICE=jemlte
-
-endif
diff --git a/products/pa_jewel.mk b/products/pa_jewel.mk
new file mode 100644
index 0000000..db9b613
--- /dev/null
+++ b/products/pa_jewel.mk
@@ -0,0 +1,25 @@
+# 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.
+
+# OVERLAY_TARGET adds overlay asset source
+OVERLAY_TARGET := pa_xhdpi
+
+# Build paprefs from sources
+PREFS_FROM_SOURCE ?= false
+
+# Inherit telephony common stuff
+$(call inherit-product, vendor/pa/configs/telephony.mk)
+
+# Include AOSPA common configuration
+include vendor/pa/main.mk
diff --git a/products/pa_jflte.mk b/products/pa_jflte.mk
index 50d8c74..d5cc290 100644
--- a/products/pa_jflte.mk
+++ b/products/pa_jflte.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_jflte,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,18 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/jflte/full_jflte.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_jflte
-PRODUCT_DEVICE := jflte
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := jflte
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=jflte TARGET_DEVICE=jflte
-
-endif
diff --git a/products/pa_l900.mk b/products/pa_l900.mk
index ef5bbbc..b108bf7 100644
--- a/products/pa_l900.mk
+++ b/products/pa_l900.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_l900,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,18 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/l900/full_l900.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := l900
-PRODUCT_NAME := pa_l900
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SPH-L900
-PRODUCT_MANUFACTURER := samsung
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=t0ltespr TARGET_DEVICE=t0ltespr BUILD_FINGERPRINT="samsung/t0ltespr/t0ltespr:4.3/JSS15J/L900VPUBMK4:user/release-keys" PRIVATE_BUILD_DESC="t0ltespr-user 4.3 JSS15J L900VPUBMK4 release-keys"
-
-endif
diff --git a/products/pa_ls980.mk b/products/pa_ls980.mk
index ccaa5e7..66c1935 100644
--- a/products/pa_ls980.mk
+++ b/products/pa_ls980.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_ls980,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_g2
@@ -27,20 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/lge/ls980/ls980.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := ls980
-PRODUCT_NAME := pa_ls980
-PRODUCT_BRAND := LGE
-PRODUCT_MODEL := LG-LS980
-PRODUCT_MANUFACTURER := lge
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=ls980 \
- BUILD_FINGERPRINT=lge/g2_spr_us/g2:4.4.2/KOT49I.LS980ZVC/LS980ZVC.1394331950:user/release-keys \
- PRIVATE_BUILD_DESC="g2_spr_us-user 4.4.2 KOT49I.LS980ZVC LS980ZVC.1394331950 release-keys"
-
-endif
diff --git a/products/pa_m4.mk b/products/pa_m4.mk
index 2a86cfc..db9b613 100644
--- a/products/pa_m4.mk
+++ b/products/pa_m4.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_m4,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,17 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/htc/m4/full_m4.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := m4
-PRODUCT_NAME := pa_m4
-PRODUCT_BRAND := HTC
-PRODUCT_MODEL := One Mini
-PRODUCT_MANUFACTURER := HTC
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=m4 BUILD_FINGERPRINT="htc/htc_europe/m4:4.4.2/KOT49H/304638.4:user/release-keys" PRIVATE_BUILD_DESC="3.10.401.4 CL304638 release-keys"
-
-endif
diff --git a/products/pa_m7.mk b/products/pa_m7.mk
index 5ba6fad..db9b613 100644
--- a/products/pa_m7.mk
+++ b/products/pa_m7.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_m7,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,17 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/htc/m7/full_m7.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := m7
-PRODUCT_NAME := pa_m7
-PRODUCT_BRAND := HTC
-PRODUCT_MODEL := One
-PRODUCT_MANUFACTURER := HTC
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=m7 BUILD_ID=KTU84L.H4 BUILD_FINGERPRINT="htc/m7_google/m7:4.4.3/KTU84L.H4/347097:user/release-keys" PRIVATE_BUILD_DESC="4.07.1700.4 CL347097 release-keys"
-
-endif
diff --git a/products/pa_m7spr.mk b/products/pa_m7spr.mk
index c317dc7..db9b613 100644
--- a/products/pa_m7spr.mk
+++ b/products/pa_m7spr.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_m7spr,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,17 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/htc/m7spr/full_m7spr.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := m7spr
-PRODUCT_NAME := pa_m7spr
-PRODUCT_BRAND := HTC
-PRODUCT_MODEL := One
-PRODUCT_MANUFACTURER := HTC
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=m7spr BUILD_ID=KOT49H BUILD_FINGERPRINT="htc/sprint_wwe/m7wls:4.4.2/KOT49H/303687.4:user/release-keys" PRIVATE_BUILD_DESC="4.06.651.4 CL303687 release-keys"
-
-endif
diff --git a/products/pa_m7vzw.mk b/products/pa_m7vzw.mk
index 4010484..db9b613 100644
--- a/products/pa_m7vzw.mk
+++ b/products/pa_m7vzw.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_m7vzw,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,19 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/htc/m7vzw/full_m7vzw.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := m7vzw
-PRODUCT_NAME := pa_m7vzw
-PRODUCT_BRAND := HTC
-PRODUCT_MODEL := One
-PRODUCT_MANUFACTURER := HTC
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=m7vzw BUILD_ID=KOT49H BUILD_FINGERPRINT="VERIZON/HTCOneVZW/m7wlv:4.4.2/KOT49H/303687.4:user/release-keys" PRIVATE_BUILD_DESC="4.06.651.4 CL303687 release-keys"
-
-PRODUCT_GMS_CLIENTID_BASE := android-verizon
-
-endif
diff --git a/products/pa_m8.mk b/products/pa_m8.mk
index 23ed6dc..f2347af 100644
--- a/products/pa_m8.mk
+++ b/products/pa_m8.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_m8,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xxhdpi
@@ -27,18 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/htc/m8/full_m8.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_m8
-PRODUCT_DEVICE := m8
-PRODUCT_BRAND := htc
-PRODUCT_MANUFACTURER := htc
-PRODUCT_MODEL := m8
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=m8 TARGET_DEVICE=m8
-
-endif
diff --git a/products/pa_maserati.mk b/products/pa_maserati.mk
index 5ece615..2193520 100644
--- a/products/pa_maserati.mk
+++ b/products/pa_maserati.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_maserati,$(TARGET_PRODUCT))
-
# Define PA bootanimation size
PARANOID_BOOTANIMATION_NAME := XHDPI
@@ -29,32 +26,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/motorola/maserati/full_maserati.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_maserati
-PRODUCT_BRAND := verizon
-PRODUCT_DEVICE := maserati
-PRODUCT_DEVICE_PREFIX := cdma
-PRODUCT_MODEL := XT894
-PRODUCT_MANUFACTURER := Motorola
-PRODUCT_RELEASE_NAME := Droid4
-PRODUCT_SFX := vzw
-
-UTC_DATE := $(shell date +%s)
-DATE := $(shell date +%Y%m%d)
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=${PRODUCT_DEVICE}_${PRODUCT_SFX} \
- BUILD_NUMBER=${DATE} \
- TARGET_DEVICE=${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE} \
- BUILD_FINGERPRINT=${PRODUCT_BRAND}/${PRODUCT_DEVICE}_${PRODUCT_SFX}/${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE}:${PLATFORM_VERSION}/${BUILD_ID}/${DATE}:user/release-keys \
- PRIVATE_BUILD_DESC="${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE}-user ${PLATFORM_VERSION} ${BUILD_ID} ${DATE} release-keys" \
- PRODUCT_BRAND=${PRODUCT_BRAND} \
- BUILD_UTC_DATE= \
- PRODUCT_DEFAULT_LANGUAGE=en \
- PRODUCT_DEFAULT_REGION=US \
-
-endif
diff --git a/products/pa_melius3gxx.mk b/products/pa_melius3gxx.mk
deleted file mode 100644
index db3e02e..0000000
--- a/products/pa_melius3gxx.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2014 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.
-
-# Check for target product
-
-ifeq (pa_melius3gxx,$(TARGET_PRODUCT))
-
-# OVERLAY_TARGET adds overlay asset source
-OVERLAY_TARGET := pa_xhdpi
-
-# Build paprefs from sources
-PREFS_FROM_SOURCE ?= false
-
-# Inherit telephony common stuff
-$(call inherit-product, vendor/pa/configs/telephony.mk)
-
-# Include AOSPA common configuration
-include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/melius3gxx/full_melius3gxx.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_melius3gxx
-PRODUCT_DEVICE := melius3gxx
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9200
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=melius3gxx BUILD_FINGERPRINT="samsung/melius3gxx/melius3g:4.4.2/KOT49H/I9200XXUDNE4:user/release-keys" PRIVATE_BUILD_DESC="melius3gxx-user 4.4.2 KOT49H I9200XXUDNE4 release-keys"
-
-endif
diff --git a/products/pa_meliusltexx.mk b/products/pa_meliusltexx.mk
deleted file mode 100644
index a36c7e4..0000000
--- a/products/pa_meliusltexx.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2014 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.
-
-# Check for target product
-
-ifeq (pa_meliusltexx,$(TARGET_PRODUCT))
-
-# OVERLAY_TARGET adds overlay asset source
-OVERLAY_TARGET := pa_xhdpi
-
-# Build paprefs from sources
-PREFS_FROM_SOURCE ?= false
-
-# Inherit telephony common stuff
-$(call inherit-product, vendor/pa/configs/telephony.mk)
-
-# Include AOSPA common configuration
-include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/meliusltexx/full_meliusltexx.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_meliusltexx
-PRODUCT_DEVICE := meliusltexx
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9205
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=meliusltexx BUILD_FINGERPRINT="samsung/meliusltexx/meliuslte:4.4.2/KOT49H/I9205XXUDNE4:user/release-keys" PRIVATE_BUILD_DESC="meliusltexx-user 4.4.2 KOT49H I9205XXUDNE4 release-keys"
-
-endif
diff --git a/products/pa_mint.mk b/products/pa_mint.mk
index 428186e..002fe92 100644
--- a/products/pa_mint.mk
+++ b/products/pa_mint.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_mint,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,19 +22,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/sony/mint/full_mint.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_mint
-PRODUCT_DEVICE := mint
-PRODUCT_BRAND := sony
-PRODUCT_MANUFACTURER := Sony
-PRODUCT_MODEL := Xperia T
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=LT30p \
- BUILD_FINGERPRINT=Sony/LT30p/LT30p:4.3/9.2.A.0.295/2P7_tg:user/release-keys \
- PRIVATE_BUILD_DESC="LT30p-user 4.3 JB-MR2-BLUE-CAF-140119-1326 51 test-keys"
-
-endif
diff --git a/products/pa_moto_msm8960.mk b/products/pa_moto_msm8960.mk
index 18de90f..db9b613 100644
--- a/products/pa_moto_msm8960.mk
+++ b/products/pa_moto_msm8960.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_moto_msm8960,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,15 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/motorola/moto_msm8960/full_moto_msm8960.mk)
-
-# Override AOSP build properties
-PRODUCT_DEVICE := moto_msm8960
-PRODUCT_NAME := pa_moto_msm8960
-PRODUCT_BRAND := motorola
-PRODUCT_MODEL := xt926
-PRODUCT_MANUFACTURER := motorola
-
-endif
diff --git a/products/pa_moto_msm8960dt.mk b/products/pa_moto_msm8960dt.mk
index ecc54fb..d5cc290 100644
--- a/products/pa_moto_msm8960dt.mk
+++ b/products/pa_moto_msm8960dt.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_moto_msm8960dt,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -27,20 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/motorola/moto_msm8960dt/full_moto_msm8960dt.mk)
-
-# Override AOSP build properties
-PRODUCT_DEVICE := moto_msm8960dt
-PRODUCT_NAME := pa_moto_msm8960dt
-PRODUCT_BRAND := motorola
-PRODUCT_MODEL := MOTOROLA MSM8960DT
-PRODUCT_MANUFACTURER := motorola
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=motorola \
- TARGET_DEVICE=moto_msm8960dt
-
-endif
diff --git a/products/pa_n1.mk b/products/pa_n1.mk
index 136da7c..056d02f 100644
--- a/products/pa_n1.mk
+++ b/products/pa_n1.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_n1,$(TARGET_PRODUCT))
-
# Define PA bootanimation size
PARANOID_BOOTANIMATION_NAME := XXHDPI
@@ -29,16 +26,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/oppo/n1/full_n1.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_n1
-PRODUCT_BRAND := Oppo
-PRODUCT_MODEL := n1
-PRODUCT_MANUFACTURER := Oppo
-TARGET_VENDOR_DEVICE_NAME := N1
-PRODUCT_GMS_CLIENTID_BASE := android-oppo
-
-endif
diff --git a/products/pa_n5100.mk b/products/pa_n5100.mk
index 6b58334..d31c81a 100644
--- a/products/pa_n5100.mk
+++ b/products/pa_n5100.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_n5100,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_tvdpi
@@ -26,18 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/n5100/full_n5100.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_n5100
-PRODUCT_DEVICE := n5100
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_MODEL := GT-N5100
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-N5100 TARGET_DEVICE=GT-N5100 BUILD_FINGERPRINT="samsung/kona3gxx/kona3g:4.3/JSS15J/N5100XXBMD1:user/release-keys" PRIVATE_BUILD_DESC="kona3gxx-user 4.3 JSS15J N5100XXBMD1 release-keys"
-
-endif
diff --git a/products/pa_n5110.mk b/products/pa_n5110.mk
index 3477608..656eb77 100644
--- a/products/pa_n5110.mk
+++ b/products/pa_n5110.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_n5110,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_tvdpi
@@ -23,18 +20,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/n5110/full_n5110.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_n5110
-PRODUCT_DEVICE := n5110
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_MODEL := GT-N5110
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=konawifixx TARGET_DEVICE=konawifi BUILD_FINGERPRINT="samsung/konawifixx/konawifi:4.2.2/JDQ39/N5110XXCMG2:user/release-keys" PRIVATE_BUILD_DESC="konawifixx-user 4.2.2 JDQ39 N5110XXCMG2 release-keys"
-
-endif
diff --git a/products/pa_n5120.mk b/products/pa_n5120.mk
index d5982fb..656eb77 100644
--- a/products/pa_n5120.mk
+++ b/products/pa_n5120.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_n5120,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_tvdpi
@@ -23,18 +20,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/n5120/full_n5120.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_n5120
-PRODUCT_DEVICE := n5120
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_MODEL := GT-N5120
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-N5120 TARGET_DEVICE=GT-N5120 BUILD_FINGERPRINT="samsung/konaltexx/konalte:4.2.2/JDQ39/N5120XXCMI1:user/release-keys" PRIVATE_BUILD_DESC="konaltexx-user 4.2.2 JDQ39 N5120XXCMI1 release-keys"
-
-endif
diff --git a/products/pa_n7000.mk b/products/pa_n7000.mk
index 6af2e48..db9b613 100644
--- a/products/pa_n7000.mk
+++ b/products/pa_n7000.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_n7000,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,16 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/n7000/full_n7000.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_n7000
-PRODUCT_BRAND := Samsung
-PRODUCT_MODEL := Galaxy Note
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-N7000 TARGET_DEVICE=GT-N7000 BUILD_FINGERPRINT=samsung/GT-N7000/GT-N7000:4.0.3/IML74K/ZCLP6:user/release-keys PRIVATE_BUILD_DESC="GT-N7000-user 4.0.3 IML74K ZCLP6 release-keys"
-
-endif
-
diff --git a/products/pa_n7100.mk b/products/pa_n7100.mk
index 85bf6c9..db9b613 100644
--- a/products/pa_n7100.mk
+++ b/products/pa_n7100.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_n7100,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,16 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/n7100/full_n7100.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_n7100
-PRODUCT_BRAND := Samsung
-PRODUCT_MODEL := Galaxy Note II
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=t03gxx TARGET_DEVICE=t03g BUILD_FINGERPRINT="samsung/t03gxx/t03g:4.1.1/JRO03C/N7100XXALJ3:user/release-keys" PRIVATE_BUILD_DESC="t03gxx-user 4.1.1 JRO03C N7100XXALJ3 release-keys"
-
-endif
-
diff --git a/products/pa_nozomi.mk b/products/pa_nozomi.mk
index 0862d83..fa7c442 100644
--- a/products/pa_nozomi.mk
+++ b/products/pa_nozomi.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_nozomi,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,16 +22,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/sony/nozomi/full_nozomi.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_nozomi
-PRODUCT_DEVICE := nozomi
-PRODUCT_BRAND := Sony
-PRODUCT_MANUFACTURER := Sony
-PRODUCT_MODEL := Xperia S
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=LT26i_1257-5499 PRODUCT_DEVICE=nozomi BUILD_FINGERPRINT=SEMC/LT26i_1257-5499/LT26i:4.0.4/6.1.A.2.50/zfd_zw:user/release-keys PRIVATE_BUILD_DESC="LT26i-user 4.0.4 6.1.A.2.50 zfd_zw test-keys"
-
-endif
diff --git a/products/pa_odin.mk b/products/pa_odin.mk
index cf00dba..d5cc290 100644
--- a/products/pa_odin.mk
+++ b/products/pa_odin.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_odin,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,16 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/sony/odin/full_odin.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_odin
-PRODUCT_DEVICE := odin
-PRODUCT_BRAND := sony
-PRODUCT_MANUFACTURER := Sony
-PRODUCT_MODEL := Xperia ZL
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=C6503 TARGET_DEVICE=odin BUILD_FINGERPRINT=Sony/C6503_1271-0336/C6503:4.2.2/10.3.A.0.423/WP5_rg:user/release-keys PRIVATE_BUILD_DESC="C6503-user 4.2.2 10.3.A.0.423 WP5_rg test-keys"
-
-endif
diff --git a/products/pa_p3100.mk b/products/pa_p3100.mk
index e72e39a..5656cfb 100644
--- a/products/pa_p3100.mk
+++ b/products/pa_p3100.mk
@@ -1,4 +1,4 @@
-ifeq (pa_p3100,$(TARGET_PRODUCT))
+
# Build paprefs from sources
PREFS_FROM_SOURCE ?= false
@@ -7,22 +7,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/samsung/p3100/full_p3100.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_p3100
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := GT-P3100
-PRODUCT_MANUFACTURER := samsung
-
-#Set build fingerprint / ID / Prduct Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=espressorfxx \
- TARGET_DEVICE=espressorf \
- BUILD_FINGERPRINT="samsung/espressorfxx/espressorf:4.2.2/JDQ39/P3100XWDNA1:user/release-keys" \
- PRIVATE_BUILD_DESC="espressorfxx-user 4.2.2 JDQ39 P3100XWDNA1 release-keys"
-
-PRODUCT_RELEASE_NAME := GT-P3100
-endif
diff --git a/products/pa_p3110.mk b/products/pa_p3110.mk
index 13f2769..9de6d30 100644
--- a/products/pa_p3110.mk
+++ b/products/pa_p3110.mk
@@ -12,27 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ifeq (pa_p3110,$(TARGET_PRODUCT))
# Build paprefs from sources
PREFS_FROM_SOURCE ?= false
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/samsung/p3110/full_p3110.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_p3110
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := GT-P3110
-PRODUCT_MANUFACTURER := samsung
-#Set build fingerprint / ID / Prduct Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=espressowifixx \
- TARGET_DEVICE=espressowifi \
- BUILD_FINGERPRINT="samsung/espressowifixx/espressowifi:4.2.2/JDQ39/P3110XXDMH1:user/release-keys" \
- PRIVATE_BUILD_DESC="espressowifixx-user 4.2.2 JDQ39 P3110XXDMH1 release-keys"
-
-PRODUCT_RELEASE_NAME := GT-P3110
-endif
diff --git a/products/pa_p880.mk b/products/pa_p880.mk
index b6a24c7..405e66f 100644
--- a/products/pa_p880.mk
+++ b/products/pa_p880.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_p880,$(TARGET_PRODUCT))
-
# Define PA bootanimation size
PARANOID_BOOTANIMATION_NAME := XHDPI
@@ -29,20 +25,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/lge/p880/full_p880.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_p880
-PRODUCT_DEVICE := p880
-PRODUCT_BRAND := lge
-PRODUCT_MANUFACTURER := lge
-PRODUCT_MODEL := LG-P880
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=x3_open_eu \
- TARGET_DEVICE=p880 \
- BUILD_FINGERPRINT="lge/x3_open_eu/x3:4.1.2/JZO54K/P88020a.1e56bb4c69:user/release-keys" \
- PRIVATE_BUILD_DESC="x3_open_eu-user 4.1.2 JZO54K P88020a.1e56bb4c69 release-keys"
-
-endif
\ No newline at end of file
diff --git a/products/pa_pollux_windy.mk b/products/pa_pollux_windy.mk
new file mode 100644
index 0000000..cac2cf6
--- /dev/null
+++ b/products/pa_pollux_windy.mk
@@ -0,0 +1,21 @@
+# Copyright (C) 2014 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.
+
+# OVERLAY_TARGET adds overlay asset source
+OVERLAY_TARGET := pa_tvdpi
+
+PREFS_FROM_SOURCE ?= false
+
+# Include AOSPA common configuration
+include vendor/pa/main.mk
diff --git a/products/pa_serrano3gxx.mk b/products/pa_serrano3gxx.mk
index 56f307e..e70e500 100644
--- a/products/pa_serrano3gxx.mk
+++ b/products/pa_serrano3gxx.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_serrano3gxx,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_hdpi
@@ -27,18 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/serrano3gxx/full_serrano3gxx.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_serrano3gxx
-PRODUCT_DEVICE := serrano3gxx
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9190
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=serrano3gxx BUILD_FINGERPRINT="samsung/serrano3gxx/serrano3g:4.2.2/JDQ39/I9190XXUAMF7:user/release-keys" PRIVATE_BUILD_DESC="serrano3gxx-user 4.2.2 JDQ39 I9190XXUAMF7 release-keys"
-
-endif
diff --git a/products/pa_serranoltexx.mk b/products/pa_serranoltexx.mk
deleted file mode 100644
index 1fb6227..0000000
--- a/products/pa_serranoltexx.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2014 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.
-
-# Check for target product
-
-ifeq (pa_serranoltexx,$(TARGET_PRODUCT))
-
-# OVERLAY_TARGET adds overlay asset source
-OVERLAY_TARGET := pa_hdpi
-
-# Build paprefs from sources
-PREFS_FROM_SOURCE ?= false
-
-# Inherit telephony common stuff
-$(call inherit-product, vendor/pa/configs/telephony.mk)
-
-# Include AOSPA common configuration
-include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/samsung/serranoltexx/full_serranoltexx.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_serranoltexx
-PRODUCT_DEVICE := serranoltexx
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9195
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=serranoltexx BUILD_FINGERPRINT="samsung/serranoltexx/serranolte:4.4.2/KOT49H/I9195XXUCNE6:user/release-keys" PRIVATE_BUILD_DESC="serranoltexx-user 4.4.2 KOT49H I9195XXUCNE6 release-keys"
-
-endif
diff --git a/products/pa_skyrocket.mk b/products/pa_skyrocket.mk
index cbf981e..3c30223 100644
--- a/products/pa_skyrocket.mk
+++ b/products/pa_skyrocket.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_skyrocket,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_skyrocket
@@ -26,16 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/samsung/skyrocket/full_skyrocket.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_skyrocket
-PRODUCT_DEVICE := skyrocket
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_MODEL := SGH-I727
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-I727 TARGET_DEVICE=SGH-I727 BUILD_FINGERPRINT="samsung/SGH-I727/SGH-I727:4.1.2/JZO54K/I727UCMC1:user/release-keys" PRIVATE_BUILD_DESC="SGH-I727-user 4.1.2 JZO54K I727UCMC1 release-keys"
-
-endif
diff --git a/products/pa_spyder.mk b/products/pa_spyder.mk
index 40cd1f6..1859d78 100644
--- a/products/pa_spyder.mk
+++ b/products/pa_spyder.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_spyder,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,32 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/motorola/spyder/full_spyder.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_spyder
-PRODUCT_BRAND := verizon
-PRODUCT_DEVICE := spyder
-PRODUCT_DEVICE_PREFIX := cdma
-PRODUCT_MODEL := XT912
-PRODUCT_MANUFACTURER := Motorola
-PRODUCT_RELEASE_NAME := DROID RAZR
-PRODUCT_SFX := vzw
-
-UTC_DATE := $(shell date +%s)
-DATE := $(shell date +%Y%m%d)
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=${PRODUCT_DEVICE}_${PRODUCT_SFX} \
- BUILD_NUMBER=${DATE} \
- TARGET_DEVICE=${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE} \
- BUILD_FINGERPRINT=${PRODUCT_BRAND}/${PRODUCT_DEVICE}_${PRODUCT_SFX}/${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE}:${PLATFORM_VERSION}/${BUILD_ID}/${DATE}:user/release-keys \
- PRIVATE_BUILD_DESC="${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE}-user ${PLATFORM_VERSION} ${BUILD_ID} ${DATE} release-keys" \
- PRODUCT_BRAND=${PRODUCT_BRAND} \
- BUILD_UTC_DATE= \
- PRODUCT_DEFAULT_LANGUAGE=en \
- PRODUCT_DEFAULT_REGION=US \
-
-endif
diff --git a/products/pa_taoshan.mk b/products/pa_taoshan.mk
new file mode 100644
index 0000000..e70e500
--- /dev/null
+++ b/products/pa_taoshan.mk
@@ -0,0 +1,25 @@
+# Copyright (C) 2014 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.
+
+# OVERLAY_TARGET adds overlay asset source
+OVERLAY_TARGET := pa_hdpi
+
+# Build paprefs from sources
+PREFS_FROM_SOURCE ?= false
+
+# Inherit telephony common stuff
+$(call inherit-product, vendor/pa/configs/telephony.mk)
+
+# Include AOSPA common configuration
+include vendor/pa/main.mk
diff --git a/products/pa_targa.mk b/products/pa_targa.mk
index e75a490..2193520 100644
--- a/products/pa_targa.mk
+++ b/products/pa_targa.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_targa,$(TARGET_PRODUCT))
-
# Define PA bootanimation size
PARANOID_BOOTANIMATION_NAME := XHDPI
@@ -29,32 +26,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/motorola/targa/full_targa.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_targa
-PRODUCT_BRAND := verizon
-PRODUCT_DEVICE := targa
-PRODUCT_DEVICE_PREFIX := cdma
-PRODUCT_MODEL := XT875
-PRODUCT_MANUFACTURER := Motorola
-PRODUCT_RELEASE_NAME := DROID_BIONIC
-PRODUCT_SFX := vzw
-
-UTC_DATE := $(shell date +%s)
-DATE := $(shell date +%Y%m%d)
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=${PRODUCT_DEVICE}_${PRODUCT_SFX} \
- BUILD_NUMBER=${DATE} \
- TARGET_DEVICE=${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE} \
- BUILD_FINGERPRINT=${PRODUCT_BRAND}/${PRODUCT_DEVICE}_${PRODUCT_SFX}/${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE}:${PLATFORM_VERSION}/${BUILD_ID}/${DATE}:user/release-keys \
- PRIVATE_BUILD_DESC="${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE}-user ${PLATFORM_VERSION} ${BUILD_ID} ${DATE} release-keys" \
- PRODUCT_BRAND=${PRODUCT_BRAND} \
- BUILD_UTC_DATE= \
- PRODUCT_DEFAULT_LANGUAGE=en \
- PRODUCT_DEFAULT_REGION=US \
-
-endif
diff --git a/products/pa_tate.mk b/products/pa_tate.mk
index 09636a7..c1404b0 100644
--- a/products/pa_tate.mk
+++ b/products/pa_tate.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_tate,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_tvdpi
@@ -23,19 +20,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-
-# Inherit AOSP device configuration
-$(call inherit-product, device/amazon/tate/full_tate.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_tate
-PRODUCT_DEVICE := tate
-PRODUCT_RELEASE_NAME := KindleFireHD
-PRODUCT_BRAND := google
-PRODUCT_MODEL := Amazon Tate
-PRODUCT_MANUFACTURER := android
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=tate TARGET_DEVICE=tate
-
-endif
diff --git a/products/pa_tf201.mk b/products/pa_tf201.mk
index 6eb783d..02f7b8b 100644
--- a/products/pa_tf201.mk
+++ b/products/pa_tf201.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_tf201,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -24,15 +21,3 @@
# Include ParanoidAndroid common configuration
include vendor/pa/main.mk
-# Inherit AOSP device configuration
-$(call inherit-product, device/asus/tf201/full_tf201.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_tf201
-PRODUCT_BRAND := Asus
-PRODUCT_MODEL := Transformer Prime
-PRODUCT_MANUFACTURER := Asus
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=tf201 BUILD_FINGERPRINT=asus/US_epad/EeePad:4.1.1/JRO03C/US_epad-10.4.2.18-20121122:user/release-keys PRIVATE_BUILD_DESC="US_epad-user 4.1.1 JRO03C US_epad-10.4.2.18-20121122 release-keys"
-
-endif
-
diff --git a/products/pa_togari.mk b/products/pa_togari.mk
index 15c2dbd..fa7c442 100644
--- a/products/pa_togari.mk
+++ b/products/pa_togari.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_togari,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,19 +22,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/sony/togari/full_togari.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_togari
-PRODUCT_DEVICE := togari
-PRODUCT_BRAND := sony
-PRODUCT_MANUFACTURER := Sony
-PRODUCT_MODEL := Xperia Z Ultra
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=C6833 \
- BUILD_FINGERPRINT=Sony/C6833_1274-8613/C6833:4.2.2/14.1.B.1.526/8bl_jw:user/release-keys \
- PRIVATE_BUILD_DESC="C6833-user 4.2.2 14.1.B.1.526 8bl_jw test-keys"
-
-endif
diff --git a/products/pa_umts_spyder.mk b/products/pa_umts_spyder.mk
index 06ff1a4..1859d78 100644
--- a/products/pa_umts_spyder.mk
+++ b/products/pa_umts_spyder.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_umts_spyder,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,31 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/motorola/umts_spyder/full_umts_spyder.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_umts_spyder
-PRODUCT_BRAND := RTGB
-PRODUCT_DEVICE := umts_spyder
-PRODUCT_MODEL := XT910
-PRODUCT_MANUFACTURER := MOTO
-PRODUCT_RELEASE_NAME := MOTOROLA RAZR
-PRODUCT_SFX := umts
-
-UTC_DATE := $(shell date +%s)
-DATE := $(shell date +%Y%m%d)
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_NAME=${PRODUCT_DEVICE}_${PRODUCT_SFX} \
- BUILD_NUMBER=${DATE} \
- TARGET_DEVICE=${PRODUCT_DEVICE} \
- BUILD_FINGERPRINT=${PRODUCT_BRAND}/${PRODUCT_DEVICE}_${PRODUCT_SFX}/${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE}:${PLATFORM_VERSION}/${BUILD_ID}/${DATE}:user/release-keys \
- PRIVATE_BUILD_DESC="${PRODUCT_DEVICE_PREFIX}_${PRODUCT_DEVICE}-user ${PLATFORM_VERSION} ${BUILD_ID} ${DATE} release-keys" \
- PRODUCT_BRAND=${PRODUCT_BRAND} \
- BUILD_UTC_DATE= \
- PRODUCT_DEFAULT_LANGUAGE=en \
- PRODUCT_DEFAULT_REGION=US \
-
-endif
diff --git a/products/pa_v500.mk b/products/pa_v500.mk
index 53a98dd..304d33f 100644
--- a/products/pa_v500.mk
+++ b/products/pa_v500.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_v500,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,16 +22,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/lge/v500/v500.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := v500
-PRODUCT_NAME := pa_v500
-PRODUCT_BRAND := LGE
-PRODUCT_MODEL := LG-V500
-PRODUCT_MANUFACTURER := lge
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=awifi_open_eu BUILD_FINGERPRINT=lge/awifi_open_eu/awifi:4.2.2/JDQ39B/V50010a.1380629540:user/release-keys PRIVATE_BUILD_DESC="awifi_open_eu-user 4.2.2 JDQ39B V50010a.1380629540 release-keys"
-
-endif
diff --git a/products/pa_ville.mk b/products/pa_ville.mk
index 71ee85e..460fa36 100644
--- a/products/pa_ville.mk
+++ b/products/pa_ville.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_ville,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_hdpi
@@ -27,18 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/htc/ville/device.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := ville
-PRODUCT_NAME := pa_ville
-PRODUCT_BRAND := HTC
-PRODUCT_MODEL := One S
-PRODUCT_MANUFACTURER := HTC
-
-# Set build fingerprint / ID / Product Name etc.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ville BUILD_FINGERPRINT=cingular_us/ville/ville:4.1.1/JRO03C/131981.6:user/release-keys PRIVATE_BUILD_DESC="3.18.502.6 CL131981 release-keys" BUILD_NUMBER=79936
-
-endif
diff --git a/products/pa_vs980.mk b/products/pa_vs980.mk
index 32c5768..66c1935 100644
--- a/products/pa_vs980.mk
+++ b/products/pa_vs980.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_vs980,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_g2
@@ -27,19 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/lge/vs980/vs980.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := vs980
-PRODUCT_NAME := pa_vs980
-PRODUCT_BRAND := LGE
-PRODUCT_MODEL := LG-VS980
-PRODUCT_MANUFACTURER := lge
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=vs980 BUILD_FINGERPRINT=lge/g2_vzw/g2:4.4.2/KOT49I.VS98024A/VS98024A.1394607468:user/release-keys PRIVATE_BUILD_DESC="g2_vzw-user 4.4.2 KOT49I.VS98024A VS98024A.1394607468 release-keys"
-
-PRODUCT_GMS_CLIENTID_BASE := android-verizon
-
-endif
diff --git a/products/pa_yuga.mk b/products/pa_yuga.mk
index ad36591..d5cc290 100644
--- a/products/pa_yuga.mk
+++ b/products/pa_yuga.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_yuga,$(TARGET_PRODUCT))
-
# OVERLAY_TARGET adds overlay asset source
OVERLAY_TARGET := pa_xhdpi
@@ -26,16 +23,3 @@
# Include AOSPA common configuration
include vendor/pa/main.mk
-
-# Inherit device configuration
-$(call inherit-product, device/sony/yuga/full_yuga.mk)
-
-# Override AOSP build properties
-PRODUCT_NAME := pa_yuga
-PRODUCT_DEVICE := yuga
-PRODUCT_BRAND := sony
-PRODUCT_MANUFACTURER := Sony
-PRODUCT_MODEL := Xperia Z
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=C6603 TARGET_DEVICE=yuga BUILD_FINGERPRINT=Sony/C6603_1270-6697/C6603:4.2.2/10.3.A.0.423/WP5_rg:user/release-keys PRIVATE_BUILD_DESC="C6603-user 4.2.2 10.3.A.0.423 WP5_rg test-keys"
-
-endif
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index 9170a92..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-add_lunch_combo pa_a510-userdebug
-add_lunch_combo pa_a700-userdebug
-add_lunch_combo pa_bacon-userdebug
-add_lunch_combo pa_d2lte-userdebug
-add_lunch_combo pa_d800-userdebug
-add_lunch_combo pa_d801-userdebug
-add_lunch_combo pa_d802-userdebug
-add_lunch_combo pa_d803-userdebug
-add_lunch_combo pa_dlx-userdebug
-add_lunch_combo pa_edison-userdebug
-add_lunch_combo pa_enrc2b-userdebug
-add_lunch_combo pa_evita-userdebug
-add_lunch_combo pa_falcon-userdebug
-add_lunch_combo pa_find5-userdebug
-add_lunch_combo pa_find7-userdebug
-add_lunch_combo pa_flo-userdebug
-add_lunch_combo pa_galaxysmtd-userdebug
-add_lunch_combo pa_gee-userdebug
-add_lunch_combo pa_geeb-userdebug
-add_lunch_combo pa_hercules-userdebug
-add_lunch_combo pa_hikari-userdebug
-add_lunch_combo pa_hlte-userdebug
-add_lunch_combo pa_honami-userdebug
-add_lunch_combo pa_i605-userdebug
-add_lunch_combo pa_i9082-userdebug
-add_lunch_combo pa_i9100-userdebug
-add_lunch_combo pa_i9100g-userdebug
-add_lunch_combo pa_i9300-userdebug
-add_lunch_combo pa_i9500-userdebug
-add_lunch_combo pa_jem-userdebug
-add_lunch_combo pa_jemlte-userdebug
-add_lunch_combo pa_jflte-userdebug
-add_lunch_combo pa_l900-userdebug
-add_lunch_combo pa_ls980-userdebug
-add_lunch_combo pa_m4-userdebug
-add_lunch_combo pa_m7-userdebug
-add_lunch_combo pa_m7spr-userdebug
-add_lunch_combo pa_m7vzw-userdebug
-add_lunch_combo pa_m8-userdebug
-add_lunch_combo pa_maserati-userdebug
-add_lunch_combo pa_meliusltexx-userdebug
-add_lunch_combo pa_melius3gxx-userdebug
-add_lunch_combo pa_mint-userdebug
-add_lunch_combo pa_moto_msm8960-userdebug
-add_lunch_combo pa_moto_msm8960dt-userdebug
-add_lunch_combo pa_n1-userdebug
-add_lunch_combo pa_n5100-userdebug
-add_lunch_combo pa_n5110-userdebug
-add_lunch_combo pa_n5120-userdebug
-add_lunch_combo pa_n7000-userdebug
-add_lunch_combo pa_n7100-userdebug
-add_lunch_combo pa_nozomi-userdebug
-add_lunch_combo pa_odin-userdebug
-add_lunch_combo pa_p3100-userdebug
-add_lunch_combo pa_p3110-userdebug
-add_lunch_combo pa_p880-userdebug
-add_lunch_combo pa_serrano3gxx-userdebug
-add_lunch_combo pa_serranoltexx-userdebug
-add_lunch_combo pa_skyrocket-userdebug
-add_lunch_combo pa_spyder-userdebug
-add_lunch_combo pa_targa-userdebug
-add_lunch_combo pa_tate-userdebug
-add_lunch_combo pa_tf201-userdebug
-add_lunch_combo pa_togari-userdebug
-add_lunch_combo pa_umts_spyder-userdebug
-add_lunch_combo pa_v500-userdebug
-add_lunch_combo pa_ville-userdebug
-add_lunch_combo pa_vs980-userdebug
-add_lunch_combo pa_yuga-userdebug