diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:13 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:13 -0700 |
| commit | ac35d07ae54094e7655ecbecacd09789d37a3bcb (patch) | |
| tree | 2ab487deaf9b2ea7e899b5e76899b04ea4bce09c | |
| parent | 82a9205099b518893ebaa7dce8e91629fece56ec (diff) | |
| download | external_webkit-ac35d07ae54094e7655ecbecacd09789d37a3bcb.zip external_webkit-ac35d07ae54094e7655ecbecacd09789d37a3bcb.tar.gz external_webkit-ac35d07ae54094e7655ecbecacd09789d37a3bcb.tar.bz2 | |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Iec42857a1f01da52a1f9e968ffa0e791404063b4
| -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 |