diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-06 17:18:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-06 17:18:44 +0000 |
| commit | 619b74c791c0fd5c106f679c425a58aca5bec1b1 (patch) | |
| tree | ee5e37d648c5a7a2b0d6306c476307290b31848f | |
| parent | 2a8d00c9ce7472f1ab6279caa35d97dadafea58f (diff) | |
| parent | 90fc4a5a610b9ecaa8fa8ad36e08a0c207ad8b6e (diff) | |
| download | chromium-master.tar.gz | |
Merge "Disable Clang compilation."HEADandroid-l-preview_r2mastermainl-preview
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -9,6 +9,10 @@ include external/chromium/base/third_party/dmg_fp/Android.mk 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 |