diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-07-01 10:01:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-01 10:01:57 -0700 |
| commit | e5f5e88f0bdf44e78791c5f1884dd400ddad0763 (patch) | |
| tree | 18eb7d269fc20b67a4e8f4da8796dd36b857a4d9 | |
| parent | a5b33abca20f49b6afd5874d1d2b07f6c37c22a5 (diff) | |
| parent | 916d73f380d9622868143d48571e3a09499979c7 (diff) | |
| download | external_webkit-e5f5e88f0bdf44e78791c5f1884dd400ddad0763.zip external_webkit-e5f5e88f0bdf44e78791c5f1884dd400ddad0763.tar.gz external_webkit-e5f5e88f0bdf44e78791c5f1884dd400ddad0763.tar.bz2 | |
Merge "Remove libsurfaceflinger_client while keeping it for AOSP"
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -376,11 +376,14 @@ LOCAL_SHARED_LIBRARIES := \ libicuuc \ libicui18n \ libmedia \ - libsurfaceflinger_client \ libEGL \ libGLESv2 \ libgui +ifeq ($(PLATFORM_VERSION),3.1.4.1.5.9.2.6.5) +LOCAL_SHARED_LIBRARIES += libsurfaceflinger_client +endif + ifeq ($(WEBCORE_INSTRUMENTATION),true) LOCAL_SHARED_LIBRARIES += libhardware_legacy endif |