Remove TARGET_BUILD_VARIANT dependency from external/llvm.

Bug: 7172695
Change-Id: I73aedcbefd36360fc68ba428be39cbab86eeee71

2 files changed, 3 insertions, 23 deletions

diff --git a/lib/CodeGen/AsmPrinter/Android.mk b/lib/CodeGen/AsmPrinter/Android.mk
index 5e22024..ce0f49b 100644
--- a/lib/CodeGen/AsmPrinter/Android.mk
+++ b/lib/CodeGen/AsmPrinter/Android.mk
@@ -35,10 +35,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES :=	\
 	AsmPrinter.cpp \
 	AsmPrinterDwarf.cpp \
-	AsmPrinterInlineAsm.cpp
-
-ifeq ($(TARGET_BUILD_VARIANT),eng)
-LOCAL_SRC_FILES :=      \
+	AsmPrinterInlineAsm.cpp \
 	ARMException.cpp        \
 	DIE.cpp \
 	DwarfAccelTable.cpp \
@@ -48,7 +45,6 @@ LOCAL_SRC_FILES :=      \
 	DwarfException.cpp      \
 	Win64Exception.cpp \
 	$(LOCAL_SRC_FILES)
-endif
 
 LOCAL_MODULE:= libLLVMAsmPrinter
 
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 23d9222..b30b427 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -13,10 +13,8 @@
 
 #define DEBUG_TYPE "asm-printer"
 #include "llvm/CodeGen/AsmPrinter.h"
-#if !defined(ANDROID_TARGET_BUILD) || defined(ANDROID_ENGINEERING_BUILD)
-#   include "DwarfDebug.h"
-#   include "DwarfException.h"
-#endif // !ANDROID_TARGET_BUILD || ANDROID_ENGINEERING_BUILD
+#include "DwarfDebug.h"
+#include "DwarfException.h"
 #include "llvm/DebugInfo.h"
 #include "llvm/Module.h"
 #include "llvm/CodeGen/GCMetadataPrinter.h"
@@ -190,7 +188,6 @@ bool AsmPrinter::doInitialization(Module &M) {
     OutStreamer.AddBlankLine();
   }
 
-#if !defined(ANDROID_TARGET_BUILD) || defined(ANDROID_ENGINEERING_BUILD)
   if (MAI->doesSupportDebugInformation())
     DD = new DwarfDebug(this, &M);
 
@@ -208,9 +205,6 @@ bool AsmPrinter::doInitialization(Module &M) {
     DE = new Win64Exception(this);
     return false;
   }
-#else
-  return false;
-#endif // !ANDROID_TARGET_BUILD || ANDROID_ENGINEERING_BUILD
 
   llvm_unreachable("Unknown exception type.");
 }
@@ -467,7 +461,6 @@ void AsmPrinter::EmitFunctionHeader() {
   }
 
   // Emit pre-function debug and/or EH information.
-#if !defined(ANDROID_TARGET_BUILD) || defined(ANDROID_ENGINEERING_BUILD)
   if (DE) {
     NamedRegionTimer T(EHTimerName, DWARFGroupName, TimePassesIsEnabled);
     DE->BeginFunction(MF);
@@ -476,7 +469,6 @@ void AsmPrinter::EmitFunctionHeader() {
     NamedRegionTimer T(DbgTimerName, DWARFGroupName, TimePassesIsEnabled);
     DD->beginFunction(MF);
   }
-#endif // !ANDROID_TARGET_BUILD || ANDROID_ENGINEERING_BUILD
 }
 
 /// EmitFunctionEntryLabel - Emit the label that is the entrypoint for the
@@ -676,12 +668,10 @@ void AsmPrinter::EmitFunctionBody() {
 
         ++EmittedInsts;
       }
-#if !defined(ANDROID_TARGET_BUILD) || defined(ANDROID_ENGINEERING_BUILD)
       if (ShouldPrintDebugScopes) {
         NamedRegionTimer T(DbgTimerName, DWARFGroupName, TimePassesIsEnabled);
         DD->beginInstruction(II);
       }
-#endif // !ANDROID_TARGET_BUILD || ANDROID_ENGINEERING_BUILD
 
       if (isVerbose())
         emitComments(*II, OutStreamer.GetCommentOS());
@@ -718,12 +708,10 @@ void AsmPrinter::EmitFunctionBody() {
         break;
       }
 
-#if !defined(ANDROID_TARGET_BUILD) || defined(ANDROID_ENGINEERING_BUILD)
       if (ShouldPrintDebugScopes) {
         NamedRegionTimer T(DbgTimerName, DWARFGroupName, TimePassesIsEnabled);
         DD->endInstruction(II);
       }
-#endif // !ANDROID_TARGET_BUILD || ANDROID_ENGINEERING_BUILD
     }
   }
 
@@ -779,7 +767,6 @@ void AsmPrinter::EmitFunctionBody() {
   }
 
   // Emit post-function debug information.
-#if !defined(ANDROID_TARGET_BUILD) || defined(ANDROID_ENGINEERING_BUILD)
   if (DD) {
     NamedRegionTimer T(DbgTimerName, DWARFGroupName, TimePassesIsEnabled);
     DD->endFunction(MF);
@@ -788,7 +775,6 @@ void AsmPrinter::EmitFunctionBody() {
     NamedRegionTimer T(EHTimerName, DWARFGroupName, TimePassesIsEnabled);
     DE->EndFunction();
   }
-#endif // !ANDROID_TARGET_BUILD || ANDROID_ENGINEERING_BUILD
   MMI->EndFunction();
 
   // Print out jump tables referenced by the function.
@@ -878,7 +864,6 @@ bool AsmPrinter::doFinalization(Module &M) {
     getObjFileLowering().emitModuleFlags(OutStreamer, ModuleFlags, Mang, TM);
 
   // Finalize debug and EH information.
-#if !defined(ANDROID_TARGET_BUILD) || defined(ANDROID_ENGINEERING_BUILD)
   if (DE) {
     {
       NamedRegionTimer T(EHTimerName, DWARFGroupName, TimePassesIsEnabled);
@@ -893,7 +878,6 @@ bool AsmPrinter::doFinalization(Module &M) {
     }
     delete DD; DD = 0;
   }
-#endif // !ANDROID_TARGET_BUILD || ANDROID_ENGINEERING_BUILD
 
   // If the target wants to know about weak references, print them all.
   if (MAI->getWeakRefDirective()) {