summaryrefslogtreecommitdiffstats
path: root/core/jni/Android.mk
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2014-10-20 10:16:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-20 10:16:08 +0000
commit38b63f0edeaa856335ce8a047404bc4ca2ac6de7 (patch)
tree1b246e5c4eeb0cb1bf0d78a4cbcc6e2b14fab13b /core/jni/Android.mk
parent25ee5c3e3b89595ca8ed97f9a66efc1b0e1bc2bf (diff)
parentdfcf065505a12aa358af5cd2607fd355eee964c4 (diff)
downloadframeworks_base-38b63f0edeaa856335ce8a047404bc4ca2ac6de7.zip
frameworks_base-38b63f0edeaa856335ce8a047404bc4ca2ac6de7.tar.gz
frameworks_base-38b63f0edeaa856335ce8a047404bc4ca2ac6de7.tar.bz2
am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit 'dfcf065505a12aa358af5cd2607fd355eee964c4': Replacing FloatMath native implementation with calls to Math
Diffstat (limited to 'core/jni/Android.mk')
-rw-r--r--core/jni/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 0cb0ea0..245e0d2 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -85,7 +85,6 @@ LOCAL_SRC_FILES:= \
android_util_Binder.cpp \
android_util_EventLog.cpp \
android_util_Log.cpp \
- android_util_FloatMath.cpp \
android_util_Process.cpp \
android_util_StringBlock.cpp \
android_util_XmlBlock.cpp \