diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2013-10-28 17:39:30 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 20:31:26 +0100 |
| commit | 46712db76c694761dd59eb67b594b62cc6526acd (patch) | |
| tree | 134ff6a3609678a4896ed5aaa253008f72a49135 | |
| parent | f20f6ebb8c5dea3cbd0d3c9c0bb6f4ade6ca659d (diff) | |
| download | build-46712db76c694761dd59eb67b594b62cc6526acd.zip build-46712db76c694761dd59eb67b594b62cc6526acd.tar.gz build-46712db76c694761dd59eb67b594b62cc6526acd.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.sh | 8 | ||||
| -rw-r--r-- | tools/device/cm.mk.template | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/envsetup.sh b/envsetup.sh index ce056a1..e47c8be 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -85,7 +85,11 @@ function check_product() 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= + 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 @@ -549,7 +553,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) |