summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-01-12 16:15:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-12 16:15:01 +0000
commita18eb9ea913e2cd19df9fe0f1b2a667339006581 (patch)
tree7d0c82041083a9f39525c98ac0c7fb6ccbd55756 /media/libmedia
parentb60bf91d2b1b2e45166cbb1eff9499de8b1c1105 (diff)
parent53dbe77b9f50cdd0de88b9d25dd643e90c8ba68b (diff)
downloadframeworks_av-a18eb9ea913e2cd19df9fe0f1b2a667339006581.zip
frameworks_av-a18eb9ea913e2cd19df9fe0f1b2a667339006581.tar.gz
frameworks_av-a18eb9ea913e2cd19df9fe0f1b2a667339006581.tar.bz2
Merge "Move roundup from frameworks/av to system/media"
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index bbfb317..4215b89 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -63,8 +63,6 @@ LOCAL_SRC_FILES:= \
StringArray.cpp \
AudioPolicy.cpp
-LOCAL_SRC_FILES += ../libnbaio/roundup.c
-
LOCAL_SHARED_LIBRARIES := \
libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \
libcamera_client libstagefright_foundation \