diff options
| author | Patrick Scott <phanna@android.com> | 2010-02-08 18:38:13 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-02-16 12:33:38 -0500 |
| commit | efee84dc0e79e8ff997f7a4ecb9ac67172031435 (patch) | |
| tree | 323e309e882c4423860a4f8c44790178a4b4d4a4 /Android.mk | |
| parent | f0cd1188eb59c99056536dcaece36f348f594ac9 (diff) | |
| download | external_webkit-efee84dc0e79e8ff997f7a4ecb9ac67172031435.zip external_webkit-efee84dc0e79e8ff997f7a4ecb9ac67172031435.tar.gz external_webkit-efee84dc0e79e8ff997f7a4ecb9ac67172031435.tar.bz2 | |
Use the new stlport build configuration.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -75,7 +75,6 @@ include $(BASE_PATH)/bison_check.mk LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ $(LOCAL_PATH)/WebKit/android/icu \ - bionic/ \ external/ \ external/icu4c/common \ external/icu4c/i18n \ @@ -210,7 +209,6 @@ 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 # Enable JSC JIT if JSC is used and ENABLE_ANDROID_JSC_JIT environment # variable is set to true @@ -264,9 +262,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 += \ - external/stlport +LOCAL_SHARED_LIBRARIES += libdl libstlport +include external/stlport/libstlport.mk endif # Build the list of static libraries |