Use header_libs from included libraries
switch from raw directory names, pick up headers as exported by the
libraries themselves.
Bug: 147679485
Test: build
Change-Id: I88ea55aead21cdf385a277a934d7d7250b5c87e2
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/Android.bp
index 0a19bec..0e9fbdd 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/Android.bp
@@ -29,12 +29,14 @@
"frameworks/native/include/media/openmax",
"frameworks/av/media/libstagefright",
"frameworks/native/include/media/hardware",
- "frameworks/av/media/libstagefright/codecs/mp3dec/include",
- "frameworks/av/media/libstagefright/codecs/mp3dec/src",
"frameworks/av/media/libmedia/include",
"frameworks/av/media/libstagefright/xmlparser/include",
],
+ header_libs: [
+ "libstagefright_mp3dec",
+ ],
+
shared_libs: [
"libstagefright",
"libstagefright_omx",
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/poc.cpp
index a559537..1ac7b76 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/poc.cpp
@@ -14,10 +14,11 @@
* limitations under the License.
*/
+#include <s_tmp3dec_file.h> // from the mp3dec library
+
#include "../includes/common.h"
#include "../includes/memutils_track.h"
#include "../includes/omxUtils.h"
-#include "codecs/mp3dec/src/s_tmp3dec_file.h"
#include "media/omx/1.0/WOmx.h"
#include "omx/include/media/stagefright/omx/1.0/Omx.h"
