commit 050eb3280d7305b84f723d515be2dc9606dc39d1
author Marco Nelissen <marcone@google.com> Fri May 09 15:10:23 2014 -0700
committer Marco Nelissen <marcone@google.com> Tue May 13 15:03:04 2014 -0700
tree 110716a883abc7e41f3507f86973224dc4bc0adb
parent 021cf9634ab09c0753a40b7c9ef4ba603be5c3da

Some crypto stuff, error codes

Add crypto/drm related functions, define some media errors
instead of using magic numbers in the code.

Change-Id: I5924cba0bfcdb3623073c9182a646b70f4ead5a5

media/ndk/Android.mk

diff --git a/media/ndk/Android.mk b/media/ndk/Android.mk
index b8dd19e..03f26a0 100644
--- a/media/ndk/Android.mk
+++ b/media/ndk/Android.mk
@@ -22,6 +22,7 @@
 
 LOCAL_SRC_FILES:=                                       \
                   NdkMediaCodec.cpp                     \
+                  NdkMediaCrypto.cpp                    \
                   NdkMediaExtractor.cpp                 \
                   NdkMediaFormat.cpp                    \
                   NdkMediaMuxer.cpp                     \
@@ -34,6 +35,7 @@
     frameworks/av/include/ndk
 
 LOCAL_SHARED_LIBRARIES := \
+    libbinder \
     libmedia \
     libstagefright \
     libstagefright_foundation \