summaryrefslogtreecommitdiffstats
path: root/core/jni/Android.mk
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-03-05 13:50:31 -0800
committerJohn Reck <jreck@google.com>2015-03-05 13:56:16 -0800
commitf4faeac3525fe1ce3707ab785a1651aec367589d (patch)
treeb49502dc2381517f3314d16fae1eef7414314a8f /core/jni/Android.mk
parentcd4ed96d10d49cb182e66aa1735f2de7596707ee (diff)
downloadframeworks_base-f4faeac3525fe1ce3707ab785a1651aec367589d.zip
frameworks_base-f4faeac3525fe1ce3707ab785a1651aec367589d.tar.gz
frameworks_base-f4faeac3525fe1ce3707ab785a1651aec367589d.tar.bz2
Cleanup Bitmap JNI attempt #2
Original version missed a spot This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
Diffstat (limited to 'core/jni/Android.mk')
-rw-r--r--core/jni/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 28f1a3a..97744ea 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -147,7 +147,7 @@ LOCAL_SRC_FILES:= \
android_hardware_location_ActivityRecognitionHardware.cpp \
android_util_FileObserver.cpp \
android/opengl/poly_clip.cpp.arm \
- android/opengl/util.cpp.arm \
+ android/opengl/util.cpp \
android_server_FingerprintManager.cpp \
android_server_NetworkManagementSocketTagger.cpp \
android_server_Watchdog.cpp \