commit c8e1e8df3de6aa51bd8ec6c7046e9aa21380307a
author William Escande <wescande@google.com> Mon Mar 07 14:05:23 2022 +0100
committer William Escande <wescande@google.com> Mon Mar 07 14:50:04 2022 +0100
tree aa7a7a73dc3a414e16caecc4cf93d86035b86452
parent 9f3a8ce4ea2f2cd32e08abd5f9a2c398020a56d6

Fix bluetooth and aac dependency

Test: m CVE-2020-0451 CVE-2019-9362 CVE-2019-9357 CVE-2019-9308 CVE-2019-9247 CVE-2018-9549 CVE-2018-9537
Bug: 220805766

Change-Id: I6cdcee15a32c2dcb2634c8b8bcc07a4f44867e26

hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp
index 9b5a6ca..6d1da4d 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp
@@ -30,8 +30,12 @@
         "external/aac/libSYS/include",
         "external/aac/libAACdec/include",
     ],
-    shared_libs: [
+    static_libs: [
         "libbluetooth",
+        "libFraunhoferAAC",
+    ],
+    shared_libs: [
+        "liblog",
     ],
     cflags: [
         "-DCHECK_OVERFLOW",

hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp
index 5b9e6dd..cb5ba03 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp
@@ -25,8 +25,12 @@
     srcs : [
         "poc.cpp",
     ],
-    shared_libs : [
+    static_libs: [
         "libbluetooth",
+        "libFraunhoferAAC",
+    ],
+    shared_libs: [
+        "liblog",
     ],
     include_dirs : [
         "external/aac/libSBRdec/src",

hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp
index b85abba..447c843 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp
@@ -32,7 +32,11 @@
         "external/aac/libFDK/include/",
         "cts/hostsidetests/securitybulletin/securityPatch/includes/",
     ],
-    shared_libs: [
+    static_libs: [
         "libbluetooth",
+        "libFraunhoferAAC",
+    ],
+    shared_libs: [
+        "liblog",
     ],
 }

hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp
index 250b45b..e842f57 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp
@@ -29,7 +29,11 @@
         "external/aac/libSYS/include",
         "external/aac/libAACdec/include",
     ],
-    shared_libs: [
+    static_libs: [
         "libbluetooth",
+        "libFraunhoferAAC",
+    ],
+    shared_libs: [
+        "liblog",
     ],
 }

hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp
index 9a7a370..21d6206 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp
@@ -30,7 +30,11 @@
         "external/aac/libAACdec/src",
         "external/aac/libSYS/include",
     ],
-    shared_libs: [
+    static_libs: [
         "libbluetooth",
+        "libFraunhoferAAC",
+    ],
+    shared_libs: [
+        "liblog",
     ],
 }

hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp
index 1cb71e3..e8c75a6 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp
@@ -25,8 +25,12 @@
     srcs: [
         "poc.cpp",
     ],
-    shared_libs: [
+    static_libs: [
         "libbluetooth",
+        "libFraunhoferAAC",
+    ],
+    shared_libs: [
+        "liblog",
     ],
     include_dirs: [
         "external/aac/libSACdec/src",

hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp
index 69ce4b1..9102c60 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp
@@ -37,7 +37,11 @@
         "external/aac/libDRCdec/include",
         "external/aac/libSBRdec/src",
     ],
-    shared_libs: [
+    static_libs: [
         "libbluetooth",
+        "libFraunhoferAAC",
+    ],
+    shared_libs: [
+        "liblog",
     ],
 }