diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-12 12:14:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 12:14:48 -0700 |
| commit | 65b45b34343dc5d5b9dbeda52e9de428e146c8f7 (patch) | |
| tree | 6bc800dde63ccb4de1a22be203b91c8cf726e348 | |
| parent | 953e5bb75e6df61f0a41601e5762f3e298c48934 (diff) | |
| parent | ac35d07ae54094e7655ecbecacd09789d37a3bcb (diff) | |
| download | external_webkit-65b45b34343dc5d5b9dbeda52e9de428e146c8f7.zip external_webkit-65b45b34343dc5d5b9dbeda52e9de428e146c8f7.tar.gz external_webkit-65b45b34343dc5d5b9dbeda52e9de428e146c8f7.tar.bz2 | |
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | Source/Android.mk | 4 |
2 files changed, 2 insertions, 10 deletions
@@ -66,10 +66,6 @@ ifneq ($(JAVASCRIPT_ENGINE),jsc) endif endif endif -# We can't use V8 on the simulator -ifeq ($(TARGET_SIMULATOR),true) - JAVASCRIPT_ENGINE = jsc -endif # V8 also requires an ARMv7 CPU, and since we must use jsc, we cannot # use the Chrome http stack either. @@ -388,14 +384,12 @@ ifeq ($(WEBCORE_INSTRUMENTATION),true) LOCAL_SHARED_LIBRARIES += libhardware_legacy endif -# We have to use the android version of libdl when we are not on the simulator -ifneq ($(TARGET_SIMULATOR),true) +# We have to use the android version of libdl 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 # We need Harfbuzz library to support complex scripts(Arabic, Thai, Hindi...). ifeq ($(SUPPORT_COMPLEX_SCRIPTS),true) diff --git a/Source/Android.mk b/Source/Android.mk index b86830a..fd1f622 100644 --- a/Source/Android.mk +++ b/Source/Android.mk @@ -250,10 +250,8 @@ ifeq ($(WEBCORE_INSTRUMENTATION),true) LOCAL_SHARED_LIBRARIES += libhardware_legacy endif -# We have to use the android version of libdl when we are not on the simulator -ifneq ($(TARGET_SIMULATOR),true) +# We have to use the android version of libdl. LOCAL_SHARED_LIBRARIES += libdl -endif # Build the list of static libraries LOCAL_STATIC_LIBRARIES := libxml2 |