diff options
| author | Joe Onorato <joeo@google.com> | 2010-10-12 14:46:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-12 14:46:23 -0700 |
| commit | 9a12a3c8d4bb20042cf69e07d268e3a04ac71f96 (patch) | |
| tree | 8077adbd81854c5b5571b57a5f9d20f28d92ca75 /services/jni/Android.mk | |
| parent | 090ac9f7dd883aa75c899745182471d409a2b762 (diff) | |
| parent | ba799098608c7be8ff1e18adfa7dc1f452205a7e (diff) | |
| download | frameworks_base-9a12a3c8d4bb20042cf69e07d268e3a04ac71f96.zip frameworks_base-9a12a3c8d4bb20042cf69e07d268e3a04ac71f96.tar.gz frameworks_base-9a12a3c8d4bb20042cf69e07d268e3a04ac71f96.tar.bz2 | |
am ba799098: Merge changes I76513387,I335fb671 into gingerbread
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp
* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
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 cdc0a6f..c90879d 100644 --- a/services/jni/Android.mk +++ b/services/jni/Android.mk @@ -23,7 +23,8 @@ LOCAL_SHARED_LIBRARIES := \ libnativehelper \ libsystem_server \ libutils \ - libui + libui \ + libsurfaceflinger_client ifeq ($(TARGET_SIMULATOR),true) ifeq ($(TARGET_OS),linux) |