commit 4a68b1cb89df9507584a51c3444aff99347afb74
author Stephen Hines <srhines@google.com> Thu May 03 12:28:14 2012 -0700
committer Stephen Hines <srhines@google.com> Thu May 03 15:36:10 2012 -0700
tree 12f4761220f5ce9d9c0abdbec7a1a8b6a001e1c5
parent b8ef690813bf3b32f996afb0ddc048c5bb23c8f5

Revert "Switch to use RSCompilerDriver."

This reverts commit fef9a1b0b772034b4f0894d1e2b29d1115617be0.

Conflicts:

	lib/ExecutionEngine/RSCompiler.cpp

Change-Id: Ic6f3a3643e286a20799e1c7f03dee5d6c3683fef

lib/ExecutionEngine/Android.mk

diff --git a/lib/ExecutionEngine/Android.mk b/lib/ExecutionEngine/Android.mk
index 8c78cd0..f9877d5 100644
--- a/lib/ExecutionEngine/Android.mk
+++ b/lib/ExecutionEngine/Android.mk
@@ -34,10 +34,10 @@
   GDBJITRegistrar.cpp \
   Initialization.cpp \
   InputFile.cpp \
+  MCCacheWriter.cpp \
+  MCCacheReader.cpp \
   ObjectLoader.cpp \
   OutputFile.cpp \
-  RSCompiler.cpp \
-  RSCompilerDriver.cpp \
   RSExecutable.cpp \
   RSForEachExpand.cpp \
   RSInfo.cpp \
@@ -47,6 +47,8 @@
   RSScript.cpp \
   BCCRuntimeStub.c \
   Script.cpp \
+  ScriptCached.cpp \
+  ScriptCompiled.cpp \
   Sha1Helper.cpp \
   Source.cpp \
   SymbolResolverProxy.cpp \