Fix the operator<< generation to work with "mmm" as well as "mm".
Change-Id: I457a74f1be68debfd351c63f282c3579c6becda2
diff --git a/build/Android.libart.mk b/build/Android.libart.mk
index f14f934..c7a85ef 100644
--- a/build/Android.libart.mk
+++ b/build/Android.libart.mk
@@ -63,7 +63,7 @@
$$(ENUM_OPERATOR_OUT_GEN): art/tools/generate-operator-out.py
$$(ENUM_OPERATOR_OUT_GEN): PRIVATE_CUSTOM_TOOL = art/tools/generate-operator-out.py $$< > $$@
-$$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PATH)/%.h
+$$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : art/%.h
$$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $$(ENUM_OPERATOR_OUT_GEN)
diff --git a/tools/generate-operator-out.py b/tools/generate-operator-out.py
index b1d102e..ca7df1e 100755
--- a/tools/generate-operator-out.py
+++ b/tools/generate-operator-out.py
@@ -123,6 +123,9 @@
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/', '')
print '#include "%s"' % header_file
print