Index: Android.mk
===================================================================
--- /dev/null
+++ Android.mk
@@ -0,0 +1,25 @@
+LOCAL_PATH := $(call my-dir)
+LLDB_ROOT_PATH := $(LOCAL_PATH)
+
+include $(CLEAR_VARS)
+
+subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
+  source/Core \
+  source/Host \
+  source/Target \
+  source/Symbol \
+  source/Expression \
+  source/Interpreter \
+  source/Breakpoint \
+  source/Utility \
+  source/DataFormatters \
+  source/Commands \
+  source/Plugins \
+  source/ \
+  tools/lldb-gdbserver \
+  ))
+
+include $(LOCAL_PATH)/lldb.mk
+include $(LOCAL_PATH)/shared_lldb.mk
+
+include $(subdirs)
Index: lldb-device-build.mk
===================================================================
--- /dev/null
+++ lldb-device-build.mk
@@ -0,0 +1,25 @@
+LOCAL_CFLAGS :=	\
+	-DLLDB_DISABLE_PYTHON \
+	-DLLDB_DISABLE_CURSES \
+	$(LOCAL_CFLAGS)
+
+LOCAL_C_INCLUDES :=	\
+	$(LLDB_ROOT_PATH)/include	\
+	$(LLDB_ROOT_PATH)/source	\
+	$(LOCAL_C_INCLUDES)
+
+LLVM_ROOT_PATH := external/llvm
+include $(LLVM_ROOT_PATH)/llvm.mk
+
+CLANG_ROOT_PATH := external/clang
+include $(CLANG_ROOT_PATH)/clang.mk
+
+include external/libcxx/libcxx.mk
+
+ifneq ($(LLVM_DEVICE_BUILD_MK),)
+include $(LLVM_DEVICE_BUILD_MK)
+endif
+
+ifneq ($(CLANG_DEVICE_BUILD_MK),)
+include $(CLANG_DEVICE_BUILD_MK)
+endif
Index: lldb-host-build.mk
===================================================================
--- /dev/null
+++ lldb-host-build.mk
@@ -0,0 +1,27 @@
+LOCAL_CFLAGS :=	\
+	-DLLDB_DISABLE_PYTHON \
+	-DLLDB_DISABLE_CURSES \
+	$(LOCAL_CFLAGS)
+
+LOCAL_C_INCLUDES :=	\
+	$(LLDB_ROOT_PATH)/include	\
+	$(LLDB_ROOT_PATH)/source	\
+	$(LOCAL_C_INCLUDES)
+
+LLVM_ROOT_PATH := external/llvm
+include $(LLVM_ROOT_PATH)/llvm.mk
+
+CLANG_ROOT_PATH := external/clang
+include $(CLANG_ROOT_PATH)/clang.mk
+
+ifneq ($(HOST_OS),windows)
+include external/libcxx/libcxx.mk
+endif
+
+ifneq ($(LLVM_HOST_BUILD_MK),)
+include $(LLVM_HOST_BUILD_MK)
+endif
+
+ifneq ($(CLANG_HOST_BUILD_MK),)
+include $(CLANG_HOST_BUILD_MK)
+endif
Index: lldb.mk
===================================================================
--- /dev/null
+++ lldb.mk
@@ -0,0 +1,6 @@
+ifeq ($(LLDB_ROOT_PATH),)
+$(error Must set variable LLDB_ROOT_PATH before including this! $(LOCAL_PATH))
+endif
+
+LLDB_HOST_BUILD_MK := $(LLDB_ROOT_PATH)/lldb-host-build.mk
+LLDB_DEVICE_BUILD_MK := $(LLDB_ROOT_PATH)/lldb-device-build.mk
Index: shared_lldb.mk
===================================================================
--- /dev/null
+++ shared_lldb.mk
@@ -0,0 +1,66 @@
+# Don't build the library unless forced to.
+ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
+# Don't build the library in unbundled branches.
+ifeq (,$(TARGET_BUILD_APPS))
+
+LOCAL_PATH:= $(call my-dir)
+
+lldb_whole_static_libraries := \
+	liblldbCore \
+	liblldbHost \
+	liblldbTarget \
+	liblldbSymbol \
+	liblldbExpression \
+	liblldbInterpreter \
+	liblldbBreakpoint \
+	liblldbUtility \
+	liblldbDataFormatters \
+	liblldbCommands \
+	liblldbPlugins \
+	liblldbTop \
+
+# It's better to put TBLGEN_TABLES into separate subdir Android.mk ...
+include $(CLEAR_TBLGEN_VARS)
+TBLGEN_TABLES := \
+	AttrList.inc \
+	AttrParsedAttrList.inc \
+	Attrs.inc \
+	CommentCommandList.inc \
+	DeclNodes.inc \
+	DiagnosticCommonKinds.inc \
+	StmtNodes.inc \
+
+# host
+include $(CLEAR_VARS)
+
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE:= liblldb
+LOCAL_MODULE_TAGS := optional
+LOCAL_WHOLE_STATIC_LIBRARIES := $(lldb_whole_static_libraries)
+
+ifeq ($(HOST_OS),windows)
+  LOCAL_SHARED_LIBRARIES := libLLVM libclang
+  LOCAL_LDLIBS := -limagehlp -lpsapi
+else
+  LOCAL_SHARED_LIBRARIES := libLLVM libclang libc++
+  LOCAL_LDLIBS := -ldl -lpthread
+endif
+
+include $(LLDB_HOST_BUILD_MK)
+include $(BUILD_HOST_SHARED_LIBRARY)
+
+# device
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= liblldb
+LOCAL_MODULE_TAGS := optional
+LOCAL_WHOLE_STATIC_LIBRARIES := $(lldb_whole_static_libraries)
+
+LOCAL_SHARED_LIBRARIES := libLLVM libclang libc++
+LOCAL_LDLIBS := -ldl
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(BUILD_SHARED_LIBRARY)
+
+endif # don't build in unbundled branches
+endif # don't build unless forced to
Index: source/Android.mk
===================================================================
--- /dev/null
+++ source/Android.mk
@@ -0,0 +1,34 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   
+lldb_top_SRC_FILES := \
+	lldb.cpp \
+	lldb-log.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_top_SRC_FILES)
+LOCAL_MODULE:= liblldbTop
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(CLANG_VERSION_INC_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_top_SRC_FILES)
+LOCAL_MODULE:= liblldbTop
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(CLANG_VERSION_INC_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/Breakpoint/Android.mk
===================================================================
--- /dev/null
+++ source/Breakpoint/Android.mk
@@ -0,0 +1,51 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   
+lldb_breakpoint_SRC_FILES := \
+	Breakpoint.cpp \
+	BreakpointID.cpp \
+	BreakpointIDList.cpp \
+	BreakpointList.cpp \
+	BreakpointLocationCollection.cpp \
+	BreakpointLocation.cpp \
+	BreakpointLocationList.cpp \
+	BreakpointOptions.cpp \
+	BreakpointResolverAddress.cpp \
+	BreakpointResolver.cpp \
+	BreakpointResolverFileLine.cpp \
+	BreakpointResolverFileRegex.cpp \
+	BreakpointResolverName.cpp \
+	BreakpointSite.cpp \
+	BreakpointSiteList.cpp \
+	StoppointCallbackContext.cpp \
+	Stoppoint.cpp \
+	StoppointLocation.cpp \
+	Watchpoint.cpp \
+	WatchpointList.cpp \
+	WatchpointOptions.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_breakpoint_SRC_FILES)
+LOCAL_MODULE:= liblldbBreakpoint
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_breakpoint_SRC_FILES)
+LOCAL_MODULE:= liblldbBreakpoint
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/Commands/Android.mk
===================================================================
--- /dev/null
+++ source/Commands/Android.mk
@@ -0,0 +1,58 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   
+lldb_commands_SRC_FILES := \
+	CommandCompletions.cpp \
+	CommandObjectApropos.cpp \
+	CommandObjectArgs.cpp \
+	CommandObjectBreakpointCommand.cpp \
+	CommandObjectBreakpoint.cpp \
+	CommandObjectCommands.cpp \
+	CommandObjectDisassemble.cpp \
+	CommandObjectExpression.cpp \
+	CommandObjectFrame.cpp \
+	CommandObjectGUI.cpp \
+	CommandObjectHelp.cpp \
+	CommandObjectLog.cpp \
+	CommandObjectMemory.cpp \
+	CommandObjectMultiword.cpp \
+	CommandObjectPlatform.cpp \
+	CommandObjectPlugin.cpp \
+	CommandObjectProcess.cpp \
+	CommandObjectQuit.cpp \
+	CommandObjectRegister.cpp \
+	CommandObjectSettings.cpp \
+	CommandObjectSource.cpp \
+	CommandObjectSyntax.cpp \
+	CommandObjectTarget.cpp \
+	CommandObjectThread.cpp \
+	CommandObjectType.cpp \
+	CommandObjectVersion.cpp \
+	CommandObjectWatchpointCommand.cpp \
+	CommandObjectWatchpoint.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_commands_SRC_FILES)
+LOCAL_MODULE:= liblldbCommands
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_commands_SRC_FILES)
+LOCAL_MODULE:= liblldbCommands
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/Core/Android.mk
===================================================================
--- /dev/null
+++ source/Core/Android.mk
@@ -0,0 +1,100 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   ConnectionSharedMemory.cpp
+lldb_core_SRC_FILES := \
+	Address.cpp \
+	AddressRange.cpp \
+	AddressResolver.cpp \
+	AddressResolverFileLine.cpp \
+	AddressResolverName.cpp \
+	ArchSpec.cpp \
+	Baton.cpp \
+	Broadcaster.cpp \
+	Communication.cpp \
+	Connection.cpp \
+	ConnectionFileDescriptor.cpp \
+	ConnectionMachPort.cpp \
+	ConstString.cpp \
+	DataBufferHeap.cpp \
+	DataBufferMemoryMap.cpp \
+	DataEncoder.cpp \
+	DataExtractor.cpp \
+	Debugger.cpp \
+	Disassembler.cpp \
+	DynamicLoader.cpp \
+	EmulateInstruction.cpp \
+	Error.cpp \
+	Event.cpp \
+	FastDemangle.cpp \
+	FileLineResolver.cpp \
+	FileSpecList.cpp \
+	History.cpp \
+	IOHandler.cpp \
+	Language.cpp \
+	Listener.cpp \
+	Log.cpp \
+	Mangled.cpp \
+	ModuleChild.cpp \
+	Module.cpp \
+	ModuleList.cpp \
+	Opcode.cpp \
+	PluginManager.cpp \
+	RegisterValue.cpp \
+	RegularExpression.cpp \
+	Scalar.cpp \
+	SearchFilter.cpp \
+	Section.cpp \
+	SourceManager.cpp \
+	State.cpp \
+	StreamAsynchronousIO.cpp \
+	StreamCallback.cpp \
+	Stream.cpp \
+	StreamFile.cpp \
+	StreamGDBRemote.cpp \
+	StreamString.cpp \
+	StringList.cpp \
+	StructuredData.cpp \
+	Timer.cpp \
+	UserID.cpp \
+	UserSettingsController.cpp \
+	UUID.cpp \
+	Value.cpp \
+	ValueObjectCast.cpp \
+	ValueObjectChild.cpp \
+	ValueObjectConstResultChild.cpp \
+	ValueObjectConstResult.cpp \
+	ValueObjectConstResultImpl.cpp \
+	ValueObject.cpp \
+	ValueObjectDynamicValue.cpp \
+	ValueObjectList.cpp \
+	ValueObjectMemory.cpp \
+	ValueObjectRegister.cpp \
+	ValueObjectSyntheticFilter.cpp \
+	ValueObjectVariable.cpp \
+	VMRange.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_core_SRC_FILES)
+LOCAL_MODULE:= liblldbCore
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_core_SRC_FILES)
+LOCAL_MODULE:= liblldbCore
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/DataFormatters/Android.mk
===================================================================
--- /dev/null
+++ source/DataFormatters/Android.mk
@@ -0,0 +1,49 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   
+lldb_data_formatters_SRC_FILES := \
+	CF.cpp \
+	Cocoa.cpp \
+	CXXFormatterFunctions.cpp \
+	DataVisualization.cpp \
+	FormatCache.cpp \
+	FormatClasses.cpp \
+	FormatManager.cpp \
+	LibCxx.cpp \
+	LibCxxList.cpp \
+	LibCxxMap.cpp \
+	LibCxxUnorderedMap.cpp \
+	LibStdcpp.cpp \
+	TypeCategory.cpp \
+	TypeCategoryMap.cpp \
+	TypeFormat.cpp \
+	TypeSummary.cpp \
+	TypeSynthetic.cpp \
+	TypeValidator.cpp \
+	ValueObjectPrinter.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_data_formatters_SRC_FILES)
+LOCAL_MODULE:= liblldbDataFormatters
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_data_formatters_SRC_FILES)
+LOCAL_MODULE:= liblldbDataFormatters
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/Expression/Android.mk
===================================================================
--- /dev/null
+++ source/Expression/Android.mk
@@ -0,0 +1,49 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   
+lldb_expression_SRC_FILES := \
+	ASTDumper.cpp \
+	ASTResultSynthesizer.cpp \
+	ASTStructExtractor.cpp \
+	ClangASTSource.cpp \
+	ClangExpressionDeclMap.cpp \
+	ClangExpressionParser.cpp \
+	ClangExpressionVariable.cpp \
+	ClangFunction.cpp \
+	ClangPersistentVariables.cpp \
+	ClangUserExpression.cpp \
+	ClangUtilityFunction.cpp \
+	DWARFExpression.cpp \
+	ExpressionSourceCode.cpp \
+	IRDynamicChecks.cpp \
+	IRExecutionUnit.cpp \
+	IRForTarget.cpp \
+	IRInterpreter.cpp \
+	IRMemoryMap.cpp \
+	Materializer.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_expression_SRC_FILES)
+LOCAL_MODULE:= liblldbExpression
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_expression_SRC_FILES)
+LOCAL_MODULE:= liblldbExpression
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/Host/Android.mk
===================================================================
--- /dev/null
+++ source/Host/Android.mk
@@ -0,0 +1,64 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   common/Editline.cpp
+lldb_host_SRC_FILES := \
+	common/Condition.cpp \
+	common/FileCache.cpp \
+	common/File.cpp \
+	common/FileSpec.cpp \
+	common/Host.cpp \
+	common/HostInfoBase.cpp \
+	common/HostNativeThreadBase.cpp \
+	common/HostProcess.cpp \
+	common/HostThread.cpp \
+	common/IOObject.cpp \
+	common/Mutex.cpp \
+	common/NativeBreakpoint.cpp \
+	common/NativeBreakpointList.cpp \
+	common/NativeProcessProtocol.cpp \
+	common/NativeThreadProtocol.cpp \
+	common/OptionParser.cpp \
+	common/Pipe.cpp \
+	common/ProcessRunLock.cpp \
+	common/SocketAddress.cpp \
+	common/Socket.cpp \
+	common/SoftwareBreakpoint.cpp \
+	common/Symbols.cpp \
+	common/Terminal.cpp \
+	common/ThisThread.cpp \
+	common/ThreadLauncher.cpp \
+	common/TimeValue.cpp \
+	posix/FileSystem.cpp \
+	posix/HostInfoPosix.cpp \
+	posix/HostProcessPosix.cpp \
+	posix/HostThreadPosix.cpp \
+	linux/Host.cpp \
+	linux/HostInfoLinux.cpp \
+	linux/HostThreadLinux.cpp \
+	linux/ThisThread.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_host_SRC_FILES)
+LOCAL_MODULE:= liblldbHost
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_host_SRC_FILES)
+LOCAL_MODULE:= liblldbHost
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/Interpreter/Android.mk
===================================================================
--- /dev/null
+++ source/Interpreter/Android.mk
@@ -0,0 +1,72 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   ScriptInterpreterPython.cpp
+lldb_interpreter_SRC_FILES := \
+	Args.cpp \
+	CommandHistory.cpp \
+	CommandInterpreter.cpp \
+	CommandObject.cpp \
+	CommandObjectRegexCommand.cpp \
+	CommandObjectScript.cpp \
+	CommandOptionValidators.cpp \
+	CommandReturnObject.cpp \
+	OptionGroupArchitecture.cpp \
+	OptionGroupBoolean.cpp \
+	OptionGroupFile.cpp \
+	OptionGroupFormat.cpp \
+	OptionGroupOutputFile.cpp \
+	OptionGroupPlatform.cpp \
+	OptionGroupString.cpp \
+	OptionGroupUInt64.cpp \
+	OptionGroupUUID.cpp \
+	OptionGroupValueObjectDisplay.cpp \
+	OptionGroupVariable.cpp \
+	OptionGroupWatchpoint.cpp \
+	Options.cpp \
+	OptionValueArch.cpp \
+	OptionValueArgs.cpp \
+	OptionValueArray.cpp \
+	OptionValueBoolean.cpp \
+	OptionValue.cpp \
+	OptionValueDictionary.cpp \
+	OptionValueEnumeration.cpp \
+	OptionValueFileSpec.cpp \
+	OptionValueFileSpecLIst.cpp \
+	OptionValueFormat.cpp \
+	OptionValuePathMappings.cpp \
+	OptionValueProperties.cpp \
+	OptionValueRegex.cpp \
+	OptionValueSInt64.cpp \
+	OptionValueString.cpp \
+	OptionValueUInt64.cpp \
+	OptionValueUUID.cpp \
+	Property.cpp \
+	PythonDataObjects.cpp \
+	ScriptInterpreter.cpp \
+	ScriptInterpreterNone.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_interpreter_SRC_FILES)
+LOCAL_MODULE:= liblldbInterpreter
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_interpreter_SRC_FILES)
+LOCAL_MODULE:= liblldbInterpreter
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/Plugins/Android.mk
===================================================================
--- /dev/null
+++ source/Plugins/Android.mk
@@ -0,0 +1,142 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   
+lldb_plugins_SRC_FILES := \
+	ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp \
+	ABI/MacOSX-arm/ABIMacOSX_arm.cpp \
+	ABI/MacOSX-i386/ABIMacOSX_i386.cpp \
+	ABI/SysV-hexagon/ABISysV_hexagon.cpp \
+	ABI/SysV-x86_64/ABISysV_x86_64.cpp \
+	Disassembler/llvm/DisassemblerLLVMC.cpp \
+	DynamicLoader/POSIX-DYLD/AuxVector.cpp \
+	DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp \
+	DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp \
+	DynamicLoader/Static/DynamicLoaderStatic.cpp \
+	Instruction/ARM64/EmulateInstructionARM64.cpp \
+	Instruction/ARM/EmulateInstructionARM.cpp \
+	Instruction/ARM/EmulationStateARM.cpp \
+	JITLoader/GDB/JITLoaderGDB.cpp \
+	LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp \
+	MemoryHistory/asan/MemoryHistoryASan.cpp \
+	ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp \
+	ObjectFile/ELF/ELFHeader.cpp \
+	ObjectFile/ELF/ObjectFileELF.cpp \
+	ObjectFile/JIT/ObjectFileJIT.cpp \
+	ObjectFile/PECOFF/ObjectFilePECOFF.cpp \
+	Platform/FreeBSD/PlatformFreeBSD.cpp \
+	Platform/gdb-server/PlatformRemoteGDBServer.cpp \
+	Platform/Kalimba/PlatformKalimba.cpp \
+	Platform/Linux/PlatformLinux.cpp \
+	Platform/MacOSX/PlatformDarwin.cpp \
+	Platform/MacOSX/PlatformRemoteiOS.cpp \
+	Platform/POSIX/PlatformPOSIX.cpp \
+	Platform/Windows/PlatformWindows.cpp \
+	Process/elf-core/ProcessElfCore.cpp \
+	Process/elf-core/RegisterContextPOSIXCore_mips64.cpp \
+	Process/elf-core/RegisterContextPOSIXCore_x86_64.cpp \
+	Process/elf-core/ThreadElfCore.cpp \
+	Process/gdb-remote/GDBRemoteCommunicationClient.cpp \
+	Process/gdb-remote/GDBRemoteCommunication.cpp \
+	Process/gdb-remote/GDBRemoteCommunicationServer.cpp \
+	Process/gdb-remote/GDBRemoteRegisterContext.cpp \
+	Process/gdb-remote/ProcessGDBRemote.cpp \
+	Process/gdb-remote/ProcessGDBRemoteLog.cpp \
+	Process/gdb-remote/ThreadGDBRemote.cpp \
+	Process/Linux/LinuxThread.cpp \
+	Process/Linux/NativeProcessLinux.cpp \
+	Process/Linux/NativeRegisterContextLinux_x86_64.cpp \
+	Process/Linux/NativeThreadLinux.cpp \
+	Process/Linux/ProcessLinux.cpp \
+	Process/Linux/ProcessMonitor.cpp \
+	Process/Linux/ProcFileReader.cpp \
+	Process/POSIX/POSIXStopInfo.cpp \
+	Process/POSIX/POSIXThread.cpp \
+	Process/POSIX/ProcessMessage.cpp \
+	Process/POSIX/ProcessPOSIX.cpp \
+	Process/POSIX/ProcessPOSIXLog.cpp \
+	Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp \
+	Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp \
+	Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp \
+	Process/Utility/DynamicRegisterInfo.cpp \
+	Process/Utility/FreeBSDSignals.cpp \
+	Process/Utility/HistoryThread.cpp \
+	Process/Utility/HistoryUnwind.cpp \
+	Process/Utility/InferiorCallPOSIX.cpp \
+	Process/Utility/LinuxSignals.cpp \
+	Process/Utility/RegisterContextDummy.cpp \
+	Process/Utility/RegisterContextFreeBSD_i386.cpp \
+	Process/Utility/RegisterContextFreeBSD_mips64.cpp \
+	Process/Utility/RegisterContextFreeBSD_x86_64.cpp \
+	Process/Utility/RegisterContextHistory.cpp \
+	Process/Utility/RegisterContextLinux_arm64.cpp \
+	Process/Utility/RegisterContextLinux_i386.cpp \
+	Process/Utility/RegisterContextLinux_x86_64.cpp \
+	Process/Utility/RegisterContextLLDB.cpp \
+	Process/Utility/RegisterContextMach_arm.cpp \
+	Process/Utility/RegisterContextMach_i386.cpp \
+	Process/Utility/RegisterContextMach_x86_64.cpp \
+	Process/Utility/RegisterContextMacOSXFrameBackchain.cpp \
+	Process/Utility/RegisterContextMemory.cpp \
+	Process/Utility/RegisterContextPOSIX_arm64.cpp \
+	Process/Utility/RegisterContextPOSIX_mips64.cpp \
+	Process/Utility/RegisterContextPOSIX_x86.cpp \
+	Process/Utility/RegisterContextThreadMemory.cpp \
+	Process/Utility/StopInfoMachException.cpp \
+	Process/Utility/ThreadMemory.cpp \
+	Process/Utility/UnwindLLDB.cpp \
+	Process/Utility/UnwindMacOSXFrameBackchain.cpp \
+	SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp \
+	SymbolFile/DWARF/DWARFCompileUnit.cpp \
+	SymbolFile/DWARF/DWARFDataExtractor.cpp \
+	SymbolFile/DWARF/DWARFDebugAbbrev.cpp \
+	SymbolFile/DWARF/DWARFDebugAranges.cpp \
+	SymbolFile/DWARF/DWARFDebugArangeSet.cpp \
+	SymbolFile/DWARF/DWARFDebugInfo.cpp \
+	SymbolFile/DWARF/DWARFDebugInfoEntry.cpp \
+	SymbolFile/DWARF/DWARFDebugLine.cpp \
+	SymbolFile/DWARF/DWARFDebugMacinfo.cpp \
+	SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp \
+	SymbolFile/DWARF/DWARFDebugPubnames.cpp \
+	SymbolFile/DWARF/DWARFDebugPubnamesSet.cpp \
+	SymbolFile/DWARF/DWARFDebugRanges.cpp \
+	SymbolFile/DWARF/DWARFDeclContext.cpp \
+	SymbolFile/DWARF/DWARFDefines.cpp \
+	SymbolFile/DWARF/DWARFDIECollection.cpp \
+	SymbolFile/DWARF/DWARFFormValue.cpp \
+	SymbolFile/DWARF/DWARFLocationDescription.cpp \
+	SymbolFile/DWARF/DWARFLocationList.cpp \
+	SymbolFile/DWARF/LogChannelDWARF.cpp \
+	SymbolFile/DWARF/NameToDIE.cpp \
+	SymbolFile/DWARF/SymbolFileDWARF.cpp \
+	SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp \
+	SymbolFile/DWARF/UniqueDWARFASTType.cpp \
+	SymbolFile/Symtab/SymbolFileSymtab.cpp \
+	SymbolVendor/ELF/SymbolVendorELF.cpp \
+	UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp \
+	UnwindAssembly/x86/UnwindAssembly-x86.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_plugins_SRC_FILES)
+LOCAL_MODULE:= liblldbPlugins
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_plugins_SRC_FILES)
+LOCAL_MODULE:= liblldbPlugins
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/Symbol/Android.mk
===================================================================
--- /dev/null
+++ source/Symbol/Android.mk
@@ -0,0 +1,57 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   
+lldb_symbol_SRC_FILES := \
+	Block.cpp \
+	ClangASTContext.cpp \
+	ClangASTImporter.cpp \
+	ClangASTType.cpp \
+	ClangExternalASTSourceCallbacks.cpp \
+	ClangExternalASTSourceCommon.cpp \
+	ClangNamespaceDecl.cpp \
+	CompileUnit.cpp \
+	Declaration.cpp \
+	DWARFCallFrameInfo.cpp \
+	Function.cpp \
+	FuncUnwinders.cpp \
+	LineEntry.cpp \
+	LineTable.cpp \
+	ObjectFile.cpp \
+	SymbolContext.cpp \
+	Symbol.cpp \
+	SymbolFile.cpp \
+	SymbolVendor.cpp \
+	Symtab.cpp \
+	Type.cpp \
+	TypeList.cpp \
+	UnwindPlan.cpp \
+	UnwindTable.cpp \
+	Variable.cpp \
+	VariableList.cpp \
+	VerifyDecl.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_symbol_SRC_FILES)
+LOCAL_MODULE:= liblldbSymbol
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_symbol_SRC_FILES)
+LOCAL_MODULE:= liblldbSymbol
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/Target/Android.mk
===================================================================
--- /dev/null
+++ source/Target/Android.mk
@@ -0,0 +1,82 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   
+lldb_target_SRC_FILES := \
+	ABI.cpp \
+	CPPLanguageRuntime.cpp \
+	ExecutionContext.cpp \
+	FileAction.cpp \
+	JITLoader.cpp \
+	JITLoaderList.cpp \
+	LanguageRuntime.cpp \
+	Memory.cpp \
+	MemoryHistory.cpp \
+	NativeRegisterContext.cpp \
+	NativeRegisterContextRegisterInfo.cpp \
+	ObjCLanguageRuntime.cpp \
+	OperatingSystem.cpp \
+	PathMappingList.cpp \
+	Platform.cpp \
+	Process.cpp \
+	ProcessInfo.cpp \
+	ProcessLaunchInfo.cpp \
+	Queue.cpp \
+	QueueItem.cpp \
+	QueueList.cpp \
+	RegisterContext.cpp \
+	SectionLoadHistory.cpp \
+	SectionLoadList.cpp \
+	StackFrame.cpp \
+	StackFrameList.cpp \
+	StackID.cpp \
+	StopInfo.cpp \
+	SystemRuntime.cpp \
+	Target.cpp \
+	TargetList.cpp \
+	ThreadCollection.cpp \
+	Thread.cpp \
+	ThreadList.cpp \
+	ThreadPlanBase.cpp \
+	ThreadPlanCallFunction.cpp \
+	ThreadPlanCallUserExpression.cpp \
+	ThreadPlan.cpp \
+	ThreadPlanRunToAddress.cpp \
+	ThreadPlanShouldStopHere.cpp \
+	ThreadPlanStepInRange.cpp \
+	ThreadPlanStepInstruction.cpp \
+	ThreadPlanStepOut.cpp \
+	ThreadPlanStepOverBreakpoint.cpp \
+	ThreadPlanStepOverRange.cpp \
+	ThreadPlanStepRange.cpp \
+	ThreadPlanStepThrough.cpp \
+	ThreadPlanStepUntil.cpp \
+	ThreadPlanTracer.cpp \
+	ThreadSpec.cpp \
+	UnixSignals.cpp \
+	UnwindAssembly.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_target_SRC_FILES)
+LOCAL_MODULE:= liblldbTarget
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_target_SRC_FILES)
+LOCAL_MODULE:= liblldbTarget
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: source/Utility/Android.mk
===================================================================
--- /dev/null
+++ source/Utility/Android.mk
@@ -0,0 +1,40 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Excluded:
+#   
+lldb_utility_SRC_FILES := \
+	ARM64_DWARF_Registers.cpp \
+	ARM_DWARF_Registers.cpp \
+	KQueue.cpp \
+	PseudoTerminal.cpp \
+	Range.cpp \
+	SharingPtr.cpp \
+	StringExtractor.cpp \
+	StringExtractorGDBRemote.cpp \
+	StringLexer.cpp \
+	TimeSpecTimeout.cpp \
+
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_utility_SRC_FILES)
+LOCAL_MODULE:= liblldbUtility
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_HOST_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the target
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lldb_utility_SRC_FILES)
+LOCAL_MODULE:= liblldbUtility
+LOCAL_MODULE_TAGS := optional
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)
Index: tools/lldb-gdbserver/Android.mk
===================================================================
--- /dev/null
+++ tools/lldb-gdbserver/Android.mk
@@ -0,0 +1,23 @@
+LOCAL_PATH:= $(call my-dir)
+
+# For the target only
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := llgs
+
+LOCAL_MODULE_CLASS := EXECUTABLES
+
+llgs_SRC_FILES := \
+  lldb-gdbserver.cpp \
+
+LOCAL_SRC_FILES := $(llgs_SRC_FILES)
+
+LOCAL_SHARED_LIBRARIES :=  \
+  libLLVM  \
+  libclang  \
+  liblldb
+
+include $(LLDB_DEVICE_BUILD_MK)
+include $(CLANG_TBLGEN_RULES_MK)
+include $(BUILD_EXECUTABLE)