diff options
| author | Steve Block <steveblock@google.com> | 2010-12-17 06:05:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-17 06:05:29 -0800 |
| commit | 3938b0eba27eaf7799cd92cf5bfd2ed8d0bbad62 (patch) | |
| tree | 66ef5ec6ef90260e8f8c8a5ad7697d9a4d00e9bf | |
| parent | 27f8b0be5e91afbcd668785adb636b43f27cc9f7 (diff) | |
| parent | b48ad822c68e606bc3874b6c83663b6c34a04208 (diff) | |
| download | external_webkit-3938b0eba27eaf7799cd92cf5bfd2ed8d0bbad62.zip external_webkit-3938b0eba27eaf7799cd92cf5bfd2ed8d0bbad62.tar.gz external_webkit-3938b0eba27eaf7799cd92cf5bfd2ed8d0bbad62.tar.bz2 | |
Merge "Fail when building with JSC and the Chrome HTTP stack"
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -93,7 +93,9 @@ endif # The Chrome stack can not be used with JSC and hence can not be used be used # with the simulator. ifeq ($(JAVASCRIPT_ENGINE),jsc) - HTTP_STACK = android + ifeq ($(HTTP_STACK),chrome) + $(error Can not build with JSC and the Chrome HTTP stack) + endif endif # Read the environment variable to determine if Autofill is compiled. |