commit 5f3be2ddcd557f5a9a5620d515772028e9c65a73
author Marco Nelissen <marcone@google.com> Mon May 05 21:28:25 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 05 21:28:25 2014 +0000
tree a5c884f81d4eb177f4b8f3765666d9756aa9b4d0
parent 39fef1f420a46025b0d72dd62eba452bbdf62e9b
parent 863c9e9cf558e7d1a6afbf000af94331ae9ba6be

Merge "Add libmediandk"

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index ce6befb..aaeb905 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -49,6 +49,7 @@
     audio-route:system/media/audio_route/include \
     wilhelm:frameworks/wilhelm/include \
     wilhelm-ut:frameworks/wilhelm/src/ut \
+    mediandk:frameworks/av/media/ndk/ \
     speex:external/speex/include
 
 #

target/product/base.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 45dd9a7..6dd77a4 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -80,6 +80,7 @@
     libutils \
     libvisualizer \
     libvorbisidec \
+    libmediandk \
     libwifi-service \
     media \
     media_cmd \