Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 584b9774 authored by bigbiff bigbiff's avatar bigbiff bigbiff Committed by Ethan Yonker
Browse files

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
parent 57332151

Android.mk

+7 −1
Original line number Diff line number Diff line
@@ -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

orscmd/Android.mk

+8 −2
Original line number Diff line number Diff line 
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_CFLAGS += -c -W

LOCAL_MODULE := orscmd

LOCAL_MODULE_STEM := twrp

LOCAL_MODULE_TAGS:= eng

variables.h

+2 −1
Original line number Diff line number Diff line
@@ -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"