diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -121,6 +121,7 @@ LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format LOCAL_CFLAGS += -fno-strict-aliasing LOCAL_CFLAGS += -include "WebCorePrefix.h" LOCAL_CFLAGS += -fvisibility=hidden +LOCAL_CFLAGS += -D__SGI_STL_INTERNAL_PAIR_H ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -Darm @@ -153,6 +154,7 @@ LOCAL_LDLIBS += -lpthread -ldl LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(JNI_H_INCLUDE) \ $(LOCAL_PATH)/WebKit/android/icu \ + bionic/ \ external/ \ external/icu4c/common \ external/icu4c/i18n \ @@ -211,8 +213,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebKit/android/WebCoreSupport \ $(LOCAL_PATH)/WebKit/android/jni \ $(LOCAL_PATH)/WebKit/android/nav \ - $(LOCAL_PATH)/WebKit/android/plugins \ - $(LOCAL_PATH)/WebKit/android/stl + $(LOCAL_PATH)/WebKit/android/plugins LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/JavaScriptCore \ @@ -257,6 +258,8 @@ 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 +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/WebKit/android/stlport endif # Build the list of static libraries |