am a1fbf8f3: Reconcile with ics-mr1-release
* commit 'a1fbf8f3ed9495b02deb624ac284dbfdf2fbfcba':
diff --git a/Android.libv8.mk b/Android.libv8.mk
index a7abe3c..f2a13c8 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -49,7 +49,7 @@
ifeq ($(ENABLE_V8_SNAPSHOT),true)
SNAP_GEN := $(intermediates)/snapshot.cc
MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot
-$(SNAP_GEN): PRIVATE_CUSTOM_TOOL = $(MKSNAPSHOT) $(SNAP_GEN)
+$(SNAP_GEN): PRIVATE_CUSTOM_TOOL = $(MKSNAPSHOT) --logfile $(intermediates)/v8.log $(SNAP_GEN)
$(SNAP_GEN): $(MKSNAPSHOT)
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(SNAP_GEN)
@@ -79,6 +79,6 @@
LOCAL_CFLAGS += -DDEBUG -UNDEBUG
endif
-LOCAL_C_INCLUDES += bionic/libc/include $(LOCAL_PATH)/src
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
include $(BUILD_STATIC_LIBRARY)