commit 960f030b4163e71c63b251250659718655edcac1
author Ethan Yonker <dees_troy@teamw.in> Sun Dec 21 21:54:00 2014 -0600
committer Dees Troy <dees_troy@teamw.in> Mon Dec 22 04:55:24 2014 +0100
tree b32474605878f4c2c8c232dfe3058ee2f4afa57a
parent 0c53203efe377196e2bf22290fed000c7ee38870

Fix twrpTar building

- ifdef around set_metadata
- Set tags as optional

Change-Id: I438e370c3bf6b590dc80ba372724c47cead6cbe5

twrpTar.cpp

diff --git a/twrpTar.cpp b/twrpTar.cpp
index 968b6b9..7f057df 100644
--- a/twrpTar.cpp
+++ b/twrpTar.cpp
@@ -44,6 +44,9 @@
 #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 @@
 		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;
 }
 

twrpTarMain/Android.mk

diff --git a/twrpTarMain/Android.mk b/twrpTarMain/Android.mk
index 5cd6fe1..6dd7d15 100644
--- a/twrpTarMain/Android.mk
+++ b/twrpTarMain/Android.mk
@@ -30,7 +30,7 @@
 
 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 @@
 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)