From d4ddd3b784f283c2abe5db031db3f1d715824e90 Mon Sep 17 00:00:00 2001 From: nkk71 Date: Fri, 8 Sep 2017 17:39:43 +0300 Subject: [PATCH] Don't build MultiROM when building TWRP --- Android.mk | 2 +- lib/Android.mk | 4 ++-- trampoline/Android.mk | 2 +- trampoline_encmnt/Android.mk | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Android.mk b/Android.mk index 5969dc04..0baf1322 100644 --- 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 index 3c5be35c..eef72b40 100644 --- 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 index f7fc89de..5f6a642a 100644 --- 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 index 5c73fa02..4c336da4 100644 --- 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