Don't build MultiROM when building TWRP

vasishath · Nov 2, 2017 · d4ddd3b · d4ddd3b
1 parent 3e2f043
commit d4ddd3b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Android.mk b/Android.mk
@@ -30,7 +30,7 @@ LOCAL_CFLAGS += -O3 -funsafe-math-optimizations
 #LOCAL_CFLAGS += -D_FORTIFY_SOURCE=2 -fstack-protector-all -O0 -g -fno-omit-frame-pointer -Wall
 
 LOCAL_MODULE:= multirom
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

diff --git a/lib/Android.mk b/lib/Android.mk
@@ -58,7 +58,7 @@ endif
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmultirom_static
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)
 LOCAL_CFLAGS += $(common_C_FLAGS)
@@ -83,7 +83,7 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmultirom
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 LOCAL_SHARED_LIBRARIES := libcutils libc libm libpng libz libft2
 LOCAL_CFLAGS += $(common_C_FLAGS)
 LOCAL_SRC_FILES := $(common_SRC_FILES)

diff --git a/trampoline/Android.mk b/trampoline/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \
     adb.c \
 
 LOCAL_MODULE:= trampoline
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)

diff --git a/trampoline_encmnt/Android.mk b/trampoline_encmnt/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= trampoline_encmnt
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)
 LOCAL_SHARED_LIBRARIES := libcryptfslollipop libcutils
@@ -45,7 +45,7 @@ ifeq ($(MR_ENCRYPTION_FAKE_PROPERTIES),true)
     include $(CLEAR_VARS)
 
     LOCAL_MODULE := libmultirom_fake_properties
-    LOCAL_MODULE_TAGS := eng
+    LOCAL_MODULE_TAGS := optional
     LOCAL_C_INCLUDES += $(multirom_local_path)
 
     LOCAL_SRC_FILES := fake_properties.c