summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-10-01 13:33:40 -0400
committerPatrick Scott <phanna@android.com>2010-10-01 13:33:40 -0400
commit1110a55e426ef3b1a91c6c9b4a012b724db72f92 (patch)
treee84cd86b3be32e584da531db7f21af36fedf5b51 /Android.mk
parente3fbba10e78cdeea2757b306d02c2853ac0187ee (diff)
downloadexternal_webkit-1110a55e426ef3b1a91c6c9b4a012b724db72f92.zip
external_webkit-1110a55e426ef3b1a91c6c9b4a012b724db72f92.tar.gz
external_webkit-1110a55e426ef3b1a91c6c9b4a012b724db72f92.tar.bz2
Build fix for the simulator.
Change-Id: Id6d2fa0d5b9ee9641466ee119ced28cfcda2f8ca
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 7ad3614..311661f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -233,7 +233,6 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
external/chromium/chrome/browser \
external/chromium/chrome/renderer \
external/chromium \
- external/chromium/android \
external/chromium/chrome \
external/skia
@@ -354,6 +353,9 @@ endif
# We have to use the android version of libdl when we are not on the simulator
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_SHARED_LIBRARIES += libdl libstlport
+# We have to fake out some headers when using stlport.
+LOCAL_C_INCLUDES += \
+ external/chromium/android
include external/stlport/libstlport.mk
endif