From 09aa871978270e22a8e77171747ff9ef71e53262 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Fri, 31 Oct 2014 15:57:45 -0700
Subject: [PATCH] Allow mm in these subdirectories.

These files weren't including llvm.mk themselves, causing
LLVM_HOST_BUILD_MK to be undefined. For make, include $(undefined_var)
fails without error, because make is quite possibly the worst tool
ever made.

Change-Id: Ic2ddd7ba844cf0da98e527b4f05511acb9db3b06
---
 lib/Support/Android.mk    | 2 ++
 lib/TableGen/Android.mk   | 3 +++
 utils/TableGen/Android.mk | 5 ++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index 5dba8d89a7d..7968697ae45 100644
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -1,4 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
+LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM_ROOT_PATH)/llvm.mk
 
 support_SRC_FILES := \
   Allocator.cpp \
diff --git a/lib/TableGen/Android.mk b/lib/TableGen/Android.mk
index 0fd94bb5697..0484f90f151 100644
--- a/lib/TableGen/Android.mk
+++ b/lib/TableGen/Android.mk
@@ -1,4 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
+LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM_ROOT_PATH)/llvm.mk
 
 libtablegen_SRC_FILES := \
   Error.cpp \
@@ -13,6 +15,7 @@ libtablegen_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SRC_FILES := $(libtablegen_SRC_FILES)
 LOCAL_MODULE:= libLLVMTableGen
diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index a74395001f3..48cc425784b 100644
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -1,4 +1,6 @@
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
+LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM_ROOT_PATH)/llvm.mk
 
 tablegen_SRC_FILES := \
   AsmMatcherEmitter.cpp \
@@ -34,6 +36,7 @@ tablegen_SRC_FILES := \
   X86RecognizableInstr.cpp
 
 include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_MODULE := llvm-tblgen
 LOCAL_MODULE_TAGS := optional
-- 
2.11.0