diff options
| author | Joe Onorato <joeo@google.com> | 2010-10-13 23:34:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 23:34:21 -0700 |
| commit | eb86aaaab34687a77454fa130b08788db1317d74 (patch) | |
| tree | 6a0b8bd8dc7d3bb45511902d5d6fba012a3c8b43 /services/jni/Android.mk | |
| parent | 4afdf666fdb034834c48445570ed9d6f4133fc71 (diff) | |
| parent | 9a12a3c8d4bb20042cf69e07d268e3a04ac71f96 (diff) | |
| download | frameworks_base-eb86aaaab34687a77454fa130b08788db1317d74.zip frameworks_base-eb86aaaab34687a77454fa130b08788db1317d74.tar.gz frameworks_base-eb86aaaab34687a77454fa130b08788db1317d74.tar.bz2 | |
am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread
Merge commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96'
* commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96':
Remove dead code, and make the animation a setting.
turn off the electron beam
Diffstat (limited to 'services/jni/Android.mk')
| -rw-r--r-- | services/jni/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/jni/Android.mk b/services/jni/Android.mk index 459551d..d10f54f 100644 --- a/services/jni/Android.mk +++ b/services/jni/Android.mk @@ -24,7 +24,8 @@ LOCAL_SHARED_LIBRARIES := \ libnativehelper \ libsystem_server \ libutils \ - libui + libui \ + libsurfaceflinger_client LOCAL_STATIC_LIBRARIES := libusbhost |