diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-27 14:34:50 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-27 14:34:50 -0700 |
| commit | 2da99bdaa1712f00525e6a84b58044332cb1baef (patch) | |
| tree | ed330500de06dc645769ea87372fb624390b52a8 /core/jni/Android.mk | |
| parent | 947f4f4d384ea26eb2145cc070a3eed42c59534a (diff) | |
| parent | cc77841f643751fd9f128e90f7d1587445ef353e (diff) | |
| download | frameworks_base-2da99bdaa1712f00525e6a84b58044332cb1baef.zip frameworks_base-2da99bdaa1712f00525e6a84b58044332cb1baef.tar.gz frameworks_base-2da99bdaa1712f00525e6a84b58044332cb1baef.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Conflicts:
include/ui/Rect.h
libs/ui/ISurfaceComposer.cpp
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index c07748e..f6f4c70 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -107,7 +107,7 @@ LOCAL_SRC_FILES:= \ android_bluetooth_HeadsetBase.cpp \ android_bluetooth_common.cpp \ android_bluetooth_BluetoothAudioGateway.cpp \ - android_bluetooth_RfcommSocket.cpp \ + android_bluetooth_BluetoothSocket.cpp \ android_bluetooth_ScoSocket.cpp \ android_server_BluetoothDeviceService.cpp \ android_server_BluetoothEventLoop.cpp \ @@ -166,8 +166,7 @@ LOCAL_SHARED_LIBRARIES := \ libicui18n \ libicudata \ libmedia \ - libwpa_client \ - libemoji + libwpa_client ifeq ($(BOARD_HAVE_BLUETOOTH),true) LOCAL_C_INCLUDES += \ |