commit d323389f4ec9feaa80435f1eeb54e643509071c6
author Marco Nelissen <marcone@google.com> Fri Sep 27 15:18:51 2019 -0700
committer Marco Nelissen <marcone@google.com> Wed Oct 02 20:41:55 2019 +0000
tree fd8ba47b16fb1edc0b00db2a6815d93ac663551d
parent 6d649f6d34f4f47dcc3a4e61c85b058921dd6daa

Update mediadrm includes

Test: build
Change-Id: I7c99efd29d559dbc8cbf0d350fb3216abe683050
Merged-In: I7c99efd29d559dbc8cbf0d350fb3216abe683050

hostsidetests/securitybulletin/securityPatch/CVE-2016-0811/Android.mk

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2016-0811/Android.mk b/hostsidetests/securitybulletin/securityPatch/CVE-2016-0811/Android.mk
index 6a0317b..3da902d 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2016-0811/Android.mk
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2016-0811/Android.mk
@@ -21,6 +21,9 @@
 LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
 
+LOCAL_HEADER_LIBRARIES := \
+    libmediadrm_headers \
+
 LOCAL_SHARED_LIBRARIES := \
     libbinder \
     libutils \

hostsidetests/securitybulletin/securityPatch/CVE-2016-0811/poc.cpp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2016-0811/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2016-0811/poc.cpp
index b34166f..19cee94 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2016-0811/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2016-0811/poc.cpp
@@ -15,9 +15,9 @@
  */
 #include <binder/IServiceManager.h>
 #include <binder/MemoryDealer.h>
-#include <media/ICrypto.h>
-#include <media/IDrm.h>
-#include <media/IMediaDrmService.h>
+#include <mediadrm/ICrypto.h>
+#include <mediadrm/IDrm.h>
+#include <mediadrm/IMediaDrmService.h>
 
 using namespace android;
 

hostsidetests/securitybulletin/securityPatch/CVE-2016-2419/poc.cpp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2016-2419/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2016-2419/poc.cpp
index 9626470..be714bf 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2016-2419/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2016-2419/poc.cpp
@@ -28,11 +28,10 @@
 #include <drm/DrmRights.h>
 #include <drm/DrmSupportInfo.h>
 #include <fcntl.h>
-#include <media/ICrypto.h>
-#include <media/IDrm.h>
 #include <media/IMediaPlayer.h>
 #include <media/IMediaPlayerClient.h>
 #include <media/IMediaPlayerService.h>
+#include <mediadrm/IDrm.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>

hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/Android.mk

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/Android.mk b/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/Android.mk
index e2a5083..811b4c9 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/Android.mk
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/Android.mk
@@ -22,6 +22,7 @@
 LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
 
+LOCAL_HEADER_LIBRARIES := libmediadrm_headers
 
 LOCAL_SHARED_LIBRARIES := libmedia libutils libbinder libmediadrm
 

hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/poc.cpp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/poc.cpp
index 4b19ae2f..e7f08688 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/poc.cpp
@@ -17,9 +17,9 @@
 #include <binder/IServiceManager.h>
 #include <binder/MemoryBase.h>
 #include <binder/MemoryHeapBase.h>
-#include <media/ICrypto.h>
-#include <media/IMediaDrmService.h>
 #include <media/hardware/CryptoAPI.h>
+#include <mediadrm/ICrypto.h>
+#include <mediadrm/IMediaDrmService.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <utils/StrongPointer.h>