commit 98603d8711b10969ba770fbb19774201212207a1
author Marco Nelissen <marcone@google.com> Tue Jul 17 11:06:55 2018 -0700
committer Marco Nelissen <marcone@google.com> Fri Aug 24 09:43:09 2018 -0700
tree f4cbd7d89e49d348ec4f42e32c45509b2acbcefa
parent ddc47d47a956e7b67449f2345ccf481e025ca62d

Add AMediaFormat functions to clear and copy

Also move NdkMediaFormat internals to libmedia to avoid a future circular
dependency between libmedia and libmediandk.

Bug: 111407253
Test: build, boot, play some files

Change-Id: I54d91439f216c3834726e5505afef40dc0d93e67

media/ndk/NdkMediaCrypto.cpp

diff --git a/media/ndk/NdkMediaCrypto.cpp b/media/ndk/NdkMediaCrypto.cpp
index d7193ca..b8af5ff 100644
--- a/media/ndk/NdkMediaCrypto.cpp
+++ b/media/ndk/NdkMediaCrypto.cpp
@@ -20,7 +20,7 @@
 
 #include <media/NdkMediaCrypto.h>
 #include <media/NdkMediaCodec.h>
-#include "NdkMediaFormatPriv.h"
+#include <media/NdkMediaFormatPriv.h>
 
 
 #include <cutils/properties.h>