From 584b977489aa559736963c4ca772c258fd323d8e Mon Sep 17 00:00:00 2001
From: bigbiff bigbiff <bigbiff@teamw.in>
Date: Thu, 8 Dec 2016 21:21:17 -0500
Subject: TWRP device version string

For building through jenkins. Export a variable to the shell
so that we don't monkey patch variables.h and keep the git tag
clean in the version string.
Jenkins will export the variable TW_DEVICE_VERSION=n where n > 0.
The makefile will use this variable to show the device string
in twrp startup. For mass production builds, omit the
environment variable to default to 0.

Change-Id: I0d6eb764255d7069c0fb4a378522a009cfe4054f
---
 Android.mk        |  8 +++++++-
 orscmd/Android.mk | 10 ++++++++--
 variables.h       |  3 ++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Android.mk b/Android.mk
index d456bfc46..80d708141 100644
--- a/Android.mk
+++ b/Android.mk
@@ -40,6 +40,12 @@ TWHTCD_PATH := $(TWRES_PATH)htcd/
 
 TARGET_RECOVERY_GUI := true
 
+ifneq ($(TW_DEVICE_VERSION),)
+    LOCAL_CFLAGS += -DTW_DEVICE_VERSION='"-$(TW_DEVICE_VERSION)"'
+else
+    LOCAL_CFLAGS += -DTW_DEVICE_VERSION='"-0"'
+endif
+
 LOCAL_SRC_FILES := \
     twrp.cpp \
     fixContexts.cpp \
@@ -164,7 +170,7 @@ endif # HAVE_SELINUX
 ifeq ($(TWHAVE_SELINUX), true)
     LOCAL_C_INCLUDES += external/libselinux/include
     LOCAL_SHARED_LIBRARIES += libselinux
-    LOCAL_CFLAGS += -DHAVE_SELINUX -g
+    LOCAL_CFLAGS += -DHAVE_SELINUX
     ifneq ($(TARGET_USERIMAGES_USE_EXT4), true)
         LOCAL_CFLAGS += -DUSE_EXT4
         LOCAL_C_INCLUDES += system/extras/ext4_utils
diff --git a/orscmd/Android.mk b/orscmd/Android.mk
index 9f18c16a7..b132d7360 100644
--- a/orscmd/Android.mk
+++ b/orscmd/Android.mk
@@ -1,10 +1,16 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+ifneq ($(TW_DEVICE_VERSION),)
+    LOCAL_CFLAGS += -DTW_DEVICE_VERSION='"-$(TW_DEVICE_VERSION)"'
+else
+    LOCAL_CFLAGS += -DTW_DEVICE_VERSION='"-0"'
+endif
+
 LOCAL_SRC_FILES:= \
 	orscmd.cpp
-LOCAL_CFLAGS:= -c -W
-LOCAL_MODULE:=orscmd
+LOCAL_CFLAGS += -c -W
+LOCAL_MODULE := orscmd
 LOCAL_MODULE_STEM := twrp
 LOCAL_MODULE_TAGS:= eng
 LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
diff --git a/variables.h b/variables.h
index 9cdbfb61e..344690229 100644
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,8 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_VERSION_STR              "3.0.3-0"
+#define TW_MAIN_VERSION_STR       "3.0.3"
+#define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
 
 #define TW_USE_COMPRESSION_VAR      "tw_use_compression"
 #define TW_FILENAME                 "tw_filename"
-- 
cgit v1.2.3