diff options
| author | bigbiff bigbiff <bigbiff@teamw.in> | 2016-12-09 03:21:17 +0100 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2017-01-18 16:44:17 +0100 |
| commit | 584b977489aa559736963c4ca772c258fd323d8e (patch) | |
| tree | b5a3209693144f5e9c3c448e2bb90d2fdedd14cf | |
| parent | build: AOSP/CM14 fixes (API 24/25, mainly BusyBox-less environment) (diff) | |
| download | android_bootable_recovery-584b977489aa559736963c4ca772c258fd323d8e.tar android_bootable_recovery-584b977489aa559736963c4ca772c258fd323d8e.tar.gz android_bootable_recovery-584b977489aa559736963c4ca772c258fd323d8e.tar.bz2 android_bootable_recovery-584b977489aa559736963c4ca772c258fd323d8e.tar.lz android_bootable_recovery-584b977489aa559736963c4ca772c258fd323d8e.tar.xz android_bootable_recovery-584b977489aa559736963c4ca772c258fd323d8e.tar.zst android_bootable_recovery-584b977489aa559736963c4ca772c258fd323d8e.zip | |
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | orscmd/Android.mk | 10 | ||||
| -rw-r--r-- | 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" |