(SHIFT) build: add ShiftOS build support

Change-Id: I0bc4c6e792c0742c4b9f22cb1a3ff10f3ee711f5
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/core/main.mk b/core/main.mk
index 771e104..89ac53f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -466,7 +466,7 @@
 
 # ------------------------------------------------------------
 # Include vendor specific additions to build properties
--include vendor/lineage/build/core/main.mk
+-include vendor/*/build/core/main.mk
 
 # ------------------------------------------------------------
 # Define a function that, given a list of module tags, returns
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 0876b1c..2dfcec5 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -93,4 +93,4 @@
 FRAMEWORKS_BASE_JAVA_SRC_DIRS := \
 	$(addprefix frameworks/base/,$(FRAMEWORKS_BASE_SUBDIRS))
 
--include vendor/lineage/build/core/pathmap.mk
+-include vendor/*/build/core/pathmap.mk
diff --git a/envsetup.sh b/envsetup.sh
index 2883348..c8376ef 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -157,7 +157,7 @@
     if (echo -n $1 | grep -q -e "^lineage_") ; then
         LINEAGE_BUILD=$(echo -n $1 | sed -e 's/^lineage_//g')
     else
-        LINEAGE_BUILD=
+        LINEAGE_BUILD=$1
     fi
     export LINEAGE_BUILD