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;
 }
 
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)