summaryrefslogtreecommitdiffstats
path: root/core/jni/Android.mk
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2014-10-16 09:32:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-16 09:32:33 +0000
commit4ef94035773757d13f611d409e51842505245221 (patch)
tree411eaa7658dd3a39af5115daf171bab182528262 /core/jni/Android.mk
parent04c2e47b0d67c0bf6a9009ae438256770537a92e (diff)
parent8a3785cafec4b47fe8d61614b04a0e193d616428 (diff)
downloadframeworks_base-4ef94035773757d13f611d409e51842505245221.zip
frameworks_base-4ef94035773757d13f611d409e51842505245221.tar.gz
frameworks_base-4ef94035773757d13f611d409e51842505245221.tar.bz2
am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '8a3785cafec4b47fe8d61614b04a0e193d616428': 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 \