diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2012-01-10 11:04:08 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-10 11:04:08 -0800 |
commit | 3fd1c792f86fedfb8075a7ccccd213f5b2d4cb71 (patch) | |
tree | 872215af44921a23356ed09a1b9fe7f2de537871 | |
parent | 7c564d38504faf606e8965c2bd77653745dc45b9 (diff) | |
parent | c2d27b8c99cdaadc0dd7e859c7eefdbc17f74366 (diff) | |
download | external_webkit-3fd1c792f86fedfb8075a7ccccd213f5b2d4cb71.zip external_webkit-3fd1c792f86fedfb8075a7ccccd213f5b2d4cb71.tar.gz external_webkit-3fd1c792f86fedfb8075a7ccccd213f5b2d4cb71.tar.bz2 |
Merge "Revert a temporary WAR before ICS open source"
-rw-r--r-- | Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -373,10 +373,6 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv2 \ libgui -ifeq ($(PLATFORM_VERSION),3.1.4.1.5.9.2.6.5) -LOCAL_SHARED_LIBRARIES += libsurfaceflinger_client -endif - # We have to use the android version of libdl LOCAL_SHARED_LIBRARIES += libdl libstlport # We have to fake out some headers when using stlport. |