Cleanup & turnoff of libMesa. DO NOT MERGEHEADmaster

Change-Id: I23538d8bcac04735bad17608ef076d4cdf64f88f

1 files changed, 118 insertions, 114 deletions

diff --git a/Android.mk b/Android.mk
index d959a00..8ae44bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,126 +1,128 @@
-# USE_LLVM_EXECUTIONENGINE not fully implemented
+# USE_LLVM_EXECUTIONENGINE is not fully implemented. We use libbcc instead.
 USE_LLVM_EXECUTIONENGINE := false
-# if using libLLVMExecutionEngine,
-# need to add files to several Android.mk in external/llvm, and comment out some stuff in llvm DynamicLibrary.cpp and Intercept.cpp
+# If using libLLVMExecutionEngine,
+# need to add files to several Android.mk in external/llvm, and comment out some stuff in
+# llvm DynamicLibrary.cpp and Intercept.cpp
 
+ifeq (0, 1)
 DEBUG_BUILD := false
 
 LOCAL_PATH := $(call my-dir)
 LLVM_ROOT_PATH := external/llvm
 
-# these are for using llvm::ExecutionEngine, also remove libbcc
-#libLLVMX86CodeGen;libLLVMX86Info;libLLVMBitReader;libLLVMSelectionDAG;libLLVMAsmPrinter;libLLVMJIT;libLLVMCodeGen;libLLVMTarget;libLLVMMC;libLLVMScalarOpts;libLLVMipo;libLLVMTransformUtils;libLLVMCore;libLLVMSupport;libLLVMSystem;libLLVMAnalysis;libLLVMInstCombine;libLLVMipa;libLLVMMCParser;libLLVMExecutionEngine;
+# These are for using llvm::ExecutionEngine, also remove libbcc
+# libLLVMX86CodeGen;libLLVMX86Info;libLLVMBitReader;libLLVMSelectionDAG;libLLVMAsmPrinter;libLLVMJIT;libLLVMCodeGen;libLLVMTarget;libLLVMMC;libLLVMScalarOpts;libLLVMipo;libLLVMTransformUtils;libLLVMCore;libLLVMSupport;libLLVMSystem;libLLVMAnalysis;libLLVMInstCombine;libLLVMipa;libLLVMMCParser;libLLVMExecutionEngine;
 libMesa_STATIC_LIBS :=	\
-	libLLVMBitReader	\
-	libLLVMSelectionDAG	\
-	libLLVMAsmPrinter	\
-	libLLVMJIT	\
-	libLLVMCodeGen	\
-	libLLVMTarget	\
-	libLLVMMC	\
-	libLLVMScalarOpts	\
-	libLLVMipo		\
-	libLLVMTransformUtils	\
-	libLLVMCore	\
-	libLLVMSupport	\
-	libLLVMSystem	\
-	libLLVMAnalysis \
-	libLLVMInstCombine \
-	libLLVMipa	\
-	libLLVMMCParser	\
-	libLLVMExecutionEngine
+    libLLVMBitReader	\
+    libLLVMSelectionDAG	\
+    libLLVMAsmPrinter	\
+    libLLVMJIT	\
+    libLLVMCodeGen	\
+    libLLVMTarget	\
+    libLLVMMC	\
+    libLLVMScalarOpts	\
+    libLLVMipo		\
+    libLLVMTransformUtils	\
+    libLLVMCore	\
+    libLLVMSupport	\
+    libLLVMSystem	\
+    libLLVMAnalysis \
+    libLLVMInstCombine \
+    libLLVMipa	\
+    libLLVMMCParser	\
+    libLLVMExecutionEngine
 
 libMesa_SRC_FILES :=	\
-	src/glsl/glcpp/pp.c \
-	src/glsl/glcpp/glcpp-lex.c \
-	src/glsl/glcpp/glcpp-parse.c \
-	src/glsl/ast_expr.cpp \
-	src/glsl/ast_function.cpp \
-	src/glsl/ast_to_hir.cpp \
-	src/glsl/ast_type.cpp \
-	src/glsl/builtin_function.cpp \
-	src/glsl/glsl_lexer.cpp \
-	src/glsl/glsl_parser.cpp \
-	src/glsl/glsl_parser_extras.cpp \
-	src/glsl/glsl_symbol_table.cpp \
-	src/glsl/glsl_types.cpp \
-	src/glsl/hir_field_selection.cpp \
-	src/glsl/ir.cpp \
-	src/glsl/ir_basic_block.cpp \
-	src/glsl/ir_clone.cpp \
-	src/glsl/ir_constant_expression.cpp \
-	src/glsl/ir_expression_flattening.cpp \
-	src/glsl/ir_function.cpp \
-	src/glsl/ir_function_can_inline.cpp \
-	src/glsl/ir_hierarchical_visitor.cpp \
-	src/glsl/ir_hv_accept.cpp \
-	src/glsl/ir_import_prototypes.cpp \
-	src/glsl/ir_print_visitor.cpp \
-	src/glsl/ir_reader.cpp \
-	src/glsl/ir_rvalue_visitor.cpp \
-	src/glsl/ir_set_program_inouts.cpp \
-	src/glsl/ir_validate.cpp \
-	src/glsl/ir_variable.cpp \
-	src/glsl/ir_variable_refcount.cpp \
-	src/glsl/link_functions.cpp \
-	src/glsl/linker.cpp \
-	src/glsl/loop_analysis.cpp \
-	src/glsl/loop_controls.cpp \
-	src/glsl/loop_unroll.cpp \
-	src/glsl/lower_discard.cpp \
-	src/glsl/lower_if_to_cond_assign.cpp \
-	src/glsl/lower_instructions.cpp \
-	src/glsl/lower_jumps.cpp \
-	src/glsl/lower_mat_op_to_vec.cpp \
-	src/glsl/lower_noise.cpp \
-	src/glsl/lower_texture_projection.cpp \
-	src/glsl/lower_variable_index_to_cond_assign.cpp \
-	src/glsl/lower_vec_index_to_cond_assign.cpp \
-	src/glsl/lower_vec_index_to_swizzle.cpp \
-	src/glsl/lower_vector.cpp \
-	src/glsl/main.cpp \
-	src/glsl/opt_algebraic.cpp \
-	src/glsl/opt_constant_folding.cpp \
-	src/glsl/opt_constant_propagation.cpp \
-	src/glsl/opt_constant_variable.cpp \
-	src/glsl/opt_copy_propagation.cpp \
-	src/glsl/opt_dead_code.cpp \
-	src/glsl/opt_dead_code_local.cpp \
-	src/glsl/opt_dead_functions.cpp \
-	src/glsl/opt_discard_simplification.cpp \
-	src/glsl/opt_function_inlining.cpp \
-	src/glsl/opt_if_simplification.cpp \
-	src/glsl/opt_noop_swizzle.cpp \
-	src/glsl/opt_redundant_jumps.cpp \
-	src/glsl/opt_structure_splitting.cpp \
-	src/glsl/opt_swizzle_swizzle.cpp \
-	src/glsl/opt_tree_grafting.cpp \
-	src/glsl/s_expression.cpp \
-	src/glsl/strtod.c \
-	src/glsl/ir_to_llvm.cpp \
-	src/mesa/main/shaderobj.c \
-	src/mesa/program/hash_table.c \
-	src/mesa/program/prog_parameter.cpp \
-	src/mesa/program/symbol_table.c \
-	src/pixelflinger2/buffer.cpp \
-	src/pixelflinger2/format.cpp \
-	src/pixelflinger2/llvm_scanline.cpp \
-	src/pixelflinger2/llvm_texture.cpp \
-	src/pixelflinger2/pixelflinger2.cpp \
-	src/pixelflinger2/raster.cpp \
-	src/pixelflinger2/scanline.cpp \
-	src/pixelflinger2/shader.cpp \
-	src/pixelflinger2/texture.cpp \
-	src/talloc/hieralloc.c
+    src/glsl/glcpp/pp.c \
+    src/glsl/glcpp/glcpp-lex.c \
+    src/glsl/glcpp/glcpp-parse.c \
+    src/glsl/ast_expr.cpp \
+    src/glsl/ast_function.cpp \
+    src/glsl/ast_to_hir.cpp \
+    src/glsl/ast_type.cpp \
+    src/glsl/builtin_function.cpp \
+    src/glsl/glsl_lexer.cpp \
+    src/glsl/glsl_parser.cpp \
+    src/glsl/glsl_parser_extras.cpp \
+    src/glsl/glsl_symbol_table.cpp \
+    src/glsl/glsl_types.cpp \
+    src/glsl/hir_field_selection.cpp \
+    src/glsl/ir.cpp \
+    src/glsl/ir_basic_block.cpp \
+    src/glsl/ir_clone.cpp \
+    src/glsl/ir_constant_expression.cpp \
+    src/glsl/ir_expression_flattening.cpp \
+    src/glsl/ir_function.cpp \
+    src/glsl/ir_function_can_inline.cpp \
+    src/glsl/ir_hierarchical_visitor.cpp \
+    src/glsl/ir_hv_accept.cpp \
+    src/glsl/ir_import_prototypes.cpp \
+    src/glsl/ir_print_visitor.cpp \
+    src/glsl/ir_reader.cpp \
+    src/glsl/ir_rvalue_visitor.cpp \
+    src/glsl/ir_set_program_inouts.cpp \
+    src/glsl/ir_validate.cpp \
+    src/glsl/ir_variable.cpp \
+    src/glsl/ir_variable_refcount.cpp \
+    src/glsl/link_functions.cpp \
+    src/glsl/linker.cpp \
+    src/glsl/loop_analysis.cpp \
+    src/glsl/loop_controls.cpp \
+    src/glsl/loop_unroll.cpp \
+    src/glsl/lower_discard.cpp \
+    src/glsl/lower_if_to_cond_assign.cpp \
+    src/glsl/lower_instructions.cpp \
+    src/glsl/lower_jumps.cpp \
+    src/glsl/lower_mat_op_to_vec.cpp \
+    src/glsl/lower_noise.cpp \
+    src/glsl/lower_texture_projection.cpp \
+    src/glsl/lower_variable_index_to_cond_assign.cpp \
+    src/glsl/lower_vec_index_to_cond_assign.cpp \
+    src/glsl/lower_vec_index_to_swizzle.cpp \
+    src/glsl/lower_vector.cpp \
+    src/glsl/main.cpp \
+    src/glsl/opt_algebraic.cpp \
+    src/glsl/opt_constant_folding.cpp \
+    src/glsl/opt_constant_propagation.cpp \
+    src/glsl/opt_constant_variable.cpp \
+    src/glsl/opt_copy_propagation.cpp \
+    src/glsl/opt_dead_code.cpp \
+    src/glsl/opt_dead_code_local.cpp \
+    src/glsl/opt_dead_functions.cpp \
+    src/glsl/opt_discard_simplification.cpp \
+    src/glsl/opt_function_inlining.cpp \
+    src/glsl/opt_if_simplification.cpp \
+    src/glsl/opt_noop_swizzle.cpp \
+    src/glsl/opt_redundant_jumps.cpp \
+    src/glsl/opt_structure_splitting.cpp \
+    src/glsl/opt_swizzle_swizzle.cpp \
+    src/glsl/opt_tree_grafting.cpp \
+    src/glsl/s_expression.cpp \
+    src/glsl/strtod.c \
+    src/glsl/ir_to_llvm.cpp \
+    src/mesa/main/shaderobj.c \
+    src/mesa/program/hash_table.c \
+    src/mesa/program/prog_parameter.cpp \
+    src/mesa/program/symbol_table.c \
+    src/pixelflinger2/buffer.cpp \
+    src/pixelflinger2/format.cpp \
+    src/pixelflinger2/llvm_scanline.cpp \
+    src/pixelflinger2/llvm_texture.cpp \
+    src/pixelflinger2/pixelflinger2.cpp \
+    src/pixelflinger2/raster.cpp \
+    src/pixelflinger2/scanline.cpp \
+    src/pixelflinger2/shader.cpp \
+    src/pixelflinger2/texture.cpp \
+    src/talloc/hieralloc.c
 
 libMesa_C_INCLUDES := \
-	$(LOCAL_PATH) \
-	$(LOCAL_PATH)/src/glsl	\
-	$(LOCAL_PATH)/src/mesa	\
-	$(LOCAL_PATH)/src/talloc	\
-	$(LOCAL_PATH)/src/mapi	\
-	$(LOCAL_PATH)/include	\
-	frameworks/compile/libbcc/include
+    $(LOCAL_PATH) \
+    $(LOCAL_PATH)/src/glsl	\
+    $(LOCAL_PATH)/src/mesa	\
+    $(LOCAL_PATH)/src/talloc	\
+    $(LOCAL_PATH)/src/mapi	\
+    $(LOCAL_PATH)/include	\
+    frameworks/compile/libbcc/include
 
 # Static library for host
 # ========================================================
@@ -145,7 +147,7 @@ LOCAL_CFLAGS += -DUSE_LLVM_EXECUTIONENGINE=0
 LOCAL_SHARED_LIBRARIES := libbcc
 endif
 
-LOCAL_C_INCLUDES :=	$(libMesa_C_INCLUDES)
+LOCAL_C_INCLUDES := $(libMesa_C_INCLUDES)
 
 include $(LLVM_ROOT_PATH)/llvm-host-build.mk
 include $(BUILD_HOST_STATIC_LIBRARY)
@@ -169,13 +171,14 @@ LOCAL_SHARED_LIBRARIES := libstlport libcutils libdl libutils
 
 ifeq ($(USE_LLVM_EXECUTIONENGINE),true)
 LOCAL_CFLAGS += -DUSE_LLVM_EXECUTIONENGINE=1
-LOCAL_STATIC_LIBRARIES :=  libLLVMARMCodeGen libLLVMARMInfo libLLVMARMDisassembler libLLVMARMAsmPrinter $(libMesa_STATIC_LIBS)
+LOCAL_STATIC_LIBRARIES :=  libLLVMARMCodeGen libLLVMARMInfo libLLVMARMDisassembler \
+    libLLVMARMAsmPrinter $(libMesa_STATIC_LIBS)
 else
 LOCAL_CFLAGS += -DUSE_LLVM_EXECUTIONENGINE=0
 LOCAL_SHARED_LIBRARIES += libbcc
 endif
 
-LOCAL_C_INCLUDES :=	$(libMesa_C_INCLUDES)
+LOCAL_C_INCLUDES := $(libMesa_C_INCLUDES)
 
 include $(LLVM_ROOT_PATH)/llvm-device-build.mk
 include $(BUILD_STATIC_LIBRARY)
@@ -200,3 +203,4 @@ include $(BUILD_HOST_EXECUTABLE)
 # Build children
 # ========================================================
 include $(call all-makefiles-under,$(LOCAL_PATH))
+endif