commit 8d3b5e184b776dbf0b4af8a1c95f027d8653ca66
author Logan Chien <loganchien@google.com> Tue Jul 12 16:19:21 2011 +0800
committer Logan Chien <loganchien@google.com> Wed Jul 13 15:35:24 2011 +0800
tree 3f651e11a71d7983d28c1eb79bf18954e8608dfb
parent 41cb761b5b36126fa4cc7f1f97e46dce6617fc81

Cleanup LOCAL_C_INCLUDES.

Change-Id: I27d05890a0aaa20e6b8bfe67aec7ff9aa6c01f08

Android.mk

diff --git a/Android.mk b/Android.mk
index daf8ed8..8482d0d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -68,6 +68,14 @@
   helper/sha1.c
 endif
 
+# Include File Search Path
+libbcc_C_INCLUDES := \
+  $(RSLOADER_ROOT_PATH)/android \
+  $(LOCAL_PATH)/lib \
+  $(LOCAL_PATH)/helper \
+  $(LOCAL_PATH)/include \
+  $(LOCAL_PATH)
+
 # Build Host SHA1 Command Line
 # ========================================================
 include $(CLEAR_VARS)
@@ -222,14 +230,7 @@
 
 LOCAL_SHARED_LIBRARIES := libdl libcutils libutils libstlport
 
-LOCAL_C_INCLUDES := \
-  $(RSLOADER_ROOT_PATH)/android \
-  $(LOCAL_PATH)/lib/ExecutionEngine \
-  $(LOCAL_PATH)/lib/CodeGen \
-  $(LOCAL_PATH)/lib \
-  $(LOCAL_PATH)/helper \
-  $(LOCAL_PATH)/include \
-  $(LOCAL_PATH)
+LOCAL_C_INCLUDES := $(libbcc_C_INCLUDES)
 
 # Modules that need get installed if and only if the target libbcc.so is installed.
 LOCAL_REQUIRED_MODULES := libclcore.bc libbcc.so.sha1
@@ -297,14 +298,7 @@
 
 LOCAL_LDLIBS := -ldl -lpthread
 
-LOCAL_C_INCLUDES := \
-  $(RSLOADER_ROOT_PATH)/android \
-  $(LOCAL_PATH)/lib/ExecutionEngine \
-  $(LOCAL_PATH)/lib/CodeGen \
-  $(LOCAL_PATH)/lib \
-  $(LOCAL_PATH)/helper \
-  $(LOCAL_PATH)/include \
-  $(LOCAL_PATH)
+LOCAL_C_INCLUDES := $(libbcc_C_INCLUDES)
 
 # definitions for LLVM
 LOCAL_CFLAGS += -DDEBUG_CODEGEN=1

lib/CodeGen/CodeEmitter.h

diff --git a/lib/CodeGen/CodeEmitter.h b/lib/CodeGen/CodeEmitter.h
index 7862a43..e63154a 100644
--- a/lib/CodeGen/CodeEmitter.h
+++ b/lib/CodeGen/CodeEmitter.h
@@ -17,7 +17,7 @@
 #include <bcc/bcc.h>
 #include <bcc/bcc_assert.h>
 #include <bcc/bcc_cache.h>
-#include "bcc_internal.h"
+#include "ExecutionEngine/bcc_internal.h"
 
 #include "Config.h"
 

lib/CodeGen/CodeMemoryManager.h

diff --git a/lib/CodeGen/CodeMemoryManager.h b/lib/CodeGen/CodeMemoryManager.h
index 833a351..ed003ec 100644
--- a/lib/CodeGen/CodeMemoryManager.h
+++ b/lib/CodeGen/CodeMemoryManager.h
@@ -14,7 +14,7 @@
 #ifndef BCC_CODEMEMORYMANAGER_H
 #define BCC_CODEMEMORYMANAGER_H
 
-#include "Compiler.h"
+#include "ExecutionEngine/Compiler.h"
 
 #include "llvm/ExecutionEngine/JITMemoryManager.h"
 

lib/ExecutionEngine/Compiler.h

diff --git a/lib/ExecutionEngine/Compiler.h b/lib/ExecutionEngine/Compiler.h
index e76f900..442e143 100644
--- a/lib/ExecutionEngine/Compiler.h
+++ b/lib/ExecutionEngine/Compiler.h
@@ -19,8 +19,8 @@
 
 #include <bcc/bcc.h>
 
-#include "CodeEmitter.h"
-#include "CodeMemoryManager.h"
+#include "CodeGen/CodeEmitter.h"
+#include "CodeGen/CodeMemoryManager.h"
 
 #if USE_MCJIT
 #include "librsloader.h"