commit | 092c544a80534e9daf7379926b93a9f5217d9e95 | [log] [tgz] |
---|---|---|
author | Christopher Dombroski <cdombroski@google.com> | Tue Oct 13 13:29:49 2020 -0700 |
committer | Christopher Dombroski <cdombroski@google.com> | Wed Oct 14 21:44:14 2020 +0000 |
tree | 113e40dbfa730cebc9db80b65847f18ceef8a0a9 | |
parent | fd529140090d388aca67a25c19906ae3809da75d [diff] |
CTS test fix for Android Security CVE-2017-9491 Bug: 114102795 Test: compiles Change-Id: I50b47aaadbac2a649e3bfb656f3ff48d0e1cbd92 Merged-In: Ib6558df70596aea0d3356d35dd2cb42975a234d4
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9491/Android.mk b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9491/Android.mk index 4e00a91..cf7cc2e 100644 --- a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9491/Android.mk +++ b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9491/Android.mk
@@ -21,7 +21,10 @@ LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 -LOCAL_C_INCLUDES := frameworks/av/include/ndk/ +LOCAL_C_INCLUDES := \ + frameworks/av/include/ndk/ \ + frameworks/av/media/ndk/include/ \ + LOCAL_SHARED_LIBRARIES := libmediandk LOCAL_SHARED_LIBRARIES += liblog
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9491/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9491/poc.cpp index adc3508..09f47b1 100644 --- a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9491/poc.cpp +++ b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9491/poc.cpp
@@ -14,7 +14,7 @@ * limitations under the License. */ #include <stdlib.h> -#include "NdkMediaCodec.h" +#include "media/NdkMediaCodec.h" #include "../includes/common.h" #define NUM_SUB_SAMPLES ((SIZE_MAX / (sizeof(size_t)*2) - 34) + 32)