Merge "Disable Clang compilation."
diff --git a/Android.mk b/Android.mk index 15fe930..e4630a3 100644 --- a/Android.mk +++ b/Android.mk
@@ -9,6 +9,10 @@ include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +# There are many Clang compilation errors we do not have +# time to fix before testing other project with Clang. +LOCAL_CLANG := false + LOCAL_CPP_EXTENSION := .cc LOCAL_MODULE := libchromium_net