From db2204490148452f293d20ff4df48fe42255879f Mon Sep 17 00:00:00 2001
From: Matt Mower <mowerm@gmail.com>
Date: Fri, 31 Oct 2014 22:43:59 -0500
Subject: Fix some module tags

There is no LOCAL_MODULES_TAGS. Fix by combining with LOCAL_MODULE_TAGS.

Change-Id: I1cacef2f8123af3632ff6a52aa62c2f2e15ac37d
---
 Android.mk            | 3 +--
 crypto/ics/Android.mk | 5 ++---
 crypto/jb/Android.mk  | 7 +++----
 libtar/Android.mk     | 8 +++-----
 pigz/Android.mk       | 5 ++---
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Android.mk b/Android.mk
index 955546176..dfdff7dbc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -431,8 +431,7 @@ include $(BUILD_EXECUTABLE)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libaosprecovery
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULES_TAGS = optional
+LOCAL_MODULE_TAGS := eng optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/libmincrypt/includes
 LOCAL_SRC_FILES = adb_install.cpp bootloader.cpp verifier.cpp mtdutils/mtdutils.c legacy_property_service.c
 LOCAL_SHARED_LIBRARIES += libc liblog libcutils libmtdutils
diff --git a/crypto/ics/Android.mk b/crypto/ics/Android.mk
index fb8449db2..5616c195a 100644
--- a/crypto/ics/Android.mk
+++ b/crypto/ics/Android.mk
@@ -3,9 +3,8 @@ ifeq ($(TW_INCLUDE_CRYPTO), true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libcryptfsics
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULES_TAGS = optional
-LOCAL_CFLAGS = 
+LOCAL_MODULE_TAGS := eng optional
+LOCAL_CFLAGS :=
 LOCAL_CFLAGS += -DCRYPTO_FS_TYPE=\"$(TW_CRYPTO_FS_TYPE)\"
 ifeq ($(TW_INCLUDE_CRYPTO_SAMSUNG), true)
     LOCAL_CFLAGS += -DTW_INCLUDE_CRYPTO_SAMSUNG=\"$(TW_INCLUDE_CRYPTO_SAMSUNG)\"
diff --git a/crypto/jb/Android.mk b/crypto/jb/Android.mk
index 03840873a..90321d67e 100644
--- a/crypto/jb/Android.mk
+++ b/crypto/jb/Android.mk
@@ -3,9 +3,8 @@ ifeq ($(TW_INCLUDE_JB_CRYPTO), true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libcryptfsjb
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULES_TAGS = optional
-LOCAL_CFLAGS = 
+LOCAL_MODULE_TAGS := eng optional
+LOCAL_CFLAGS :=
 LOCAL_SRC_FILES = cryptfs.c
 LOCAL_C_INCLUDES += \
     system/extras/ext4_utils \
@@ -15,4 +14,4 @@ LOCAL_SHARED_LIBRARIES += libc liblog libcutils libcrypto libext4_utils
 LOCAL_STATIC_LIBRARIES += libfs_mgrtwrp libscrypttwrp_static liblogwraptwrp libmincrypttwrp
 
 include $(BUILD_SHARED_LIBRARY)
-endif
\ No newline at end of file
+endif
diff --git a/libtar/Android.mk b/libtar/Android.mk
index 1972573bb..838b44175 100644
--- a/libtar/Android.mk
+++ b/libtar/Android.mk
@@ -4,9 +4,8 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libtar
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULES_TAGS = optional
-LOCAL_CFLAGS = 
+LOCAL_MODULE_TAGS := eng optional
+LOCAL_CFLAGS :=
 LOCAL_SRC_FILES = append.c block.c decode.c encode.c extract.c handle.c output.c util.c wrapper.c basename.c strmode.c libtar_hash.c libtar_list.c dirname.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
 					external/zlib
@@ -24,8 +23,7 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libtar_static
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULES_TAGS = optional
+LOCAL_MODULE_TAGS := eng optional
 LOCAL_CFLAGS = 
 LOCAL_SRC_FILES = append.c block.c decode.c encode.c extract.c handle.c output.c util.c wrapper.c basename.c strmode.c libtar_hash.c libtar_list.c dirname.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
diff --git a/pigz/Android.mk b/pigz/Android.mk
index 7a5a4ee92..9b9313da8 100644
--- a/pigz/Android.mk
+++ b/pigz/Android.mk
@@ -3,11 +3,10 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := pigz
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := eng optional
 LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
 LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-LOCAL_MODULES_TAGS = optional
-LOCAL_CFLAGS = 
+LOCAL_CFLAGS :=
 LOCAL_SRC_FILES = pigz.c yarn.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
 					external/zlib
-- 
cgit v1.2.3