summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2013-10-28 16:39:30 (GMT)
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-01-02 17:07:47 (GMT)
commitf43fa45e36cfc656502e8de69cc2a2ddc106fb57 (patch)
tree8bca6b7ae55ef3f75889a414c2015931fbc1037e
parentabad783728ff1beb13ad4ced6970103a9a0c4536 (diff)
downloadbuild-f43fa45e36cfc656502e8de69cc2a2ddc106fb57.zip
build-f43fa45e36cfc656502e8de69cc2a2ddc106fb57.tar.gz
build-f43fa45e36cfc656502e8de69cc2a2ddc106fb57.tar.bz2
Initial Replicant 4.2 commit
Change-Id: I69b539d5a87304d53b62d112d6895fd36bfc6446 Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Conflicts: envsetup.sh tools/device/cm.mk.template
-rw-r--r--envsetup.sh17
-rw-r--r--tools/device/cm.mk.template2
2 files changed, 10 insertions, 9 deletions
diff --git a/envsetup.sh b/envsetup.sh
index cf53ec5..58fbed3 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -87,14 +87,15 @@ function check_product()
if (echo -n $1 | grep -q -e "^lineage_") ; then
CM_BUILD=$(echo -n $1 | sed -e 's/^lineage_//g')
export BUILD_NUMBER=$((date +%s%N ; echo $CM_BUILD; hostname) | openssl sha1 | sed -e 's/.*=//g; s/ //g' | cut -c1-10)
- else
+ elif (echo -n $1 | grep -q -e "^cm_") ; then
# Fall back to cm_<product>
- if (echo -n $1 | grep -q -e "^cm_") ; then
- CM_BUILD=$(echo -n $1 | sed -e 's/^cm_//g')
- export BUILD_NUMBER=$((date +%s%N ; echo $CM_BUILD; hostname) | openssl sha1 | sed -e 's/.*=//g; s/ //g' | cut -c1-10)
- else
- CM_BUILD=
- fi
+ CM_BUILD=$(echo -n $1 | sed -e 's/^cm_//g')
+ export BUILD_NUMBER=$((date +%s%N ; echo $CM_BUILD; hostname) | openssl sha1 | sed -e 's/.*=//g; s/ //g' | cut -c1-10)
+ elif (echo -n $1 | grep -q -e "^replicant_") ; then
+ CM_BUILD=$(echo -n $1 | sed -e 's/^replicant_//g')
+ export BUILD_NUMBER=$((date +%s%N ; echo $CM_BUILD; hostname) | openssl sha1 | sed -e 's/.*=//g; s/ //g' | cut -c1-10)
+ else
+ CM_BUILD=
fi
export CM_BUILD
@@ -558,7 +559,7 @@ function breakfast()
CM_DEVICES_ONLY="true"
unset LUNCH_MENU_CHOICES
add_lunch_combo full-eng
- for f in `/bin/ls vendor/cm/vendorsetup.sh 2> /dev/null`
+ for f in `/bin/ls vendor/replicant/vendorsetup.sh 2> /dev/null`
do
echo "including $f"
. $f
diff --git a/tools/device/cm.mk.template b/tools/device/cm.mk.template
index e07898a..83f79dd 100644
--- a/tools/device/cm.mk.template
+++ b/tools/device/cm.mk.template
@@ -2,7 +2,7 @@
PRODUCT_RELEASE_NAME := __DEVICE__
# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
+$(call inherit-product, vendor/replicant/config/common_full_phone.mk)
# Inherit device configuration
$(call inherit-product, device/__MANUFACTURER__/__DEVICE__/device___DEVICE__.mk)