summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-08-12 17:59:23 +0100
committerKristian Monsen <kristianm@google.com>2010-08-12 17:59:23 +0100
commitf3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (patch)
tree579e3222bca50bb2fce3cb9c11e0fd50654103b9 /Android.mk
parent1338f824ca6c264f4bc118d7e945e45132cf93b4 (diff)
downloadexternal_webkit-f3d41ba51d86bf719c7a65ab5297aea3c17e2d98.zip
external_webkit-f3d41ba51d86bf719c7a65ab5297aea3c17e2d98.tar.gz
external_webkit-f3d41ba51d86bf719c7a65ab5297aea3c17e2d98.tar.bz2
Build fix. Guard chromium headers, and never use chrome stack in simulator.
Change-Id: Iaf9a9de73870c497b9c925af3b1637a07b399640
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index df2344a..1ffe589 100644
--- a/Android.mk
+++ b/Android.mk
@@ -79,10 +79,12 @@ ifneq ($(JAVASCRIPT_ENGINE),jsc)
endif
# Read the HTTP_STACK environment variable, default is android
+ifeq ($(TARGET_SIMULATOR),false)
HTTP_STACK = $(HTTP)
ifneq ($(HTTP_STACK),chrome)
HTTP_STACK = android
endif
+endif
BASE_PATH := $(call my-dir)
include $(CLEAR_VARS)