Create separate Android.mk for main build targets

The runtime, compiler, dex2oat, and oatdump now are in seperate trees
to prevent dependency creep.  They can now be individually built
without rebuilding the rest of the art projects. dalvikvm and jdwpspy
were already this way. Builds in the art directory should behave as
before, building everything including tests.

Change-Id: Ic6b1151e5ed0f823c3dd301afd2b13eb2d8feb81

1 files changed, 3 insertions, 4 deletions

diff --git a/tools/generate-operator-out.py b/tools/generate-operator-out.py
index aa0c00e743..678e6642f3 100755
--- a/tools/generate-operator-out.py
+++ b/tools/generate-operator-out.py
@@ -158,8 +158,9 @@ def ProcessFile(filename):
     _ENUMS[enum_name].append((enum_value, enum_text))
 
 def main():
+  local_path = sys.argv[1]
   header_files = []
-  for header_file in sys.argv[1:]:
+  for header_file in sys.argv[2:]:
     header_files.append(header_file)
     ProcessFile(header_file)
 
@@ -167,9 +168,7 @@ def main():
   print
 
   for header_file in header_files:
-    # Make gives us paths relative to the top of the tree, but our -I is art/.
-    # We also have -I art/src/, but icu4c is higher on the include path and has a "mutex.h" too.
-    header_file = header_file.replace('art/', '')
+    header_file = header_file.replace(local_path + '/', '')
     print '#include "%s"' % header_file
 
   print