From 960f030b4163e71c63b251250659718655edcac1 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Sun, 21 Dec 2014 21:54:00 -0600
Subject: Fix twrpTar building

- ifdef around set_metadata
- Set tags as optional

Change-Id: I438e370c3bf6b590dc80ba372724c47cead6cbe5
---
 twrpTar.cpp            | 5 +++++
 twrpTarMain/Android.mk | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/twrpTar.cpp b/twrpTar.cpp
index 968b6b9e7..7f057df98 100644
--- a/twrpTar.cpp
+++ b/twrpTar.cpp
@@ -44,6 +44,9 @@ extern "C" {
 #ifndef BUILD_TWRPTAR_MAIN
 #include "data.hpp"
 #include "infomanager.hpp"
+extern "C" {
+	#include "set_metadata.h"
+}
 #endif //ndef BUILD_TWRPTAR_MAIN
 
 using namespace std;
@@ -1243,7 +1246,9 @@ int twrpTar::closeTar() {
 		LOGERR("Backup file size for '%s' is 0 bytes.\n", tarfn.c_str());
 		return -1;
 	}
+#ifndef BUILD_TWRPTAR_MAIN
 	tw_set_default_metadata(tarfn.c_str());
+#endif
 	return 0;
 }
 
diff --git a/twrpTarMain/Android.mk b/twrpTarMain/Android.mk
index 5cd6fe109..6dd7d155c 100644
--- a/twrpTarMain/Android.mk
+++ b/twrpTarMain/Android.mk
@@ -30,7 +30,7 @@ endif
 
 LOCAL_MODULE:= twrpTar_static
 LOCAL_FORCE_STATIC_EXECUTABLE := true
-LOCAL_MODULE_TAGS:= eng
+LOCAL_MODULE_TAGS:= optional
 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
 include $(BUILD_EXECUTABLE)
@@ -65,7 +65,7 @@ else
 endif
 
 LOCAL_MODULE:= twrpTar
-LOCAL_MODULE_TAGS:= eng
+LOCAL_MODULE_TAGS:= optional
 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
 include $(BUILD_EXECUTABLE)
-- 
cgit v1.2.3