From 05f04367397306dc191da72ab2482f37367b6e50 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Mon, 28 Oct 2013 17:39:30 +0100 Subject: Initial Replicant 4.2 commit Change-Id: I69b539d5a87304d53b62d112d6895fd36bfc6446 Signed-off-by: Paul Kocialkowski --- envsetup.sh | 10 +++++++--- tools/device/cm.mk.template | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index a1eb875..c411510 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -73,7 +73,11 @@ function check_product() if (echo -n $1 | grep -q -e "^cm_") ; then CM_BUILD=$(echo -n $1 | sed -e 's/^cm_//g') else - CM_BUILD= + if (echo -n $1 | grep -q -e "^replicant_") ; then + CM_BUILD=$(echo -n $1 | sed -e 's/^replicant_//g') + else + CM_BUILD= + fi fi export CM_BUILD @@ -270,7 +274,7 @@ function addcompletions() local T dir f - dirs="sdk/bash_completion vendor/cm/bash_completion" + dirs="sdk/bash_completion vendor/replicant/bash_completion" for dir in $dirs; do if [ -d ${dir} ]; then for f in `/bin/ls ${dir}/[a-z]*.bash 2> /dev/null`; do @@ -510,7 +514,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 ed5ce1d..cb45de7 100644 --- a/tools/device/cm.mk.template +++ b/tools/device/cm.mk.template @@ -1,11 +1,11 @@ ## Specify phone tech before including full_phone -$(call inherit-product, vendor/cm/config/gsm.mk) +$(call inherit-product, vendor/replicant/config/gsm.mk) # Release name 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) -- cgit v1.1