commit 96c4298263a0f40bc7ec7f6531173baba444ee70
author William Escande <wescande@google.com> Thu Mar 10 12:48:12 2022 +0000
committer William Escande <wescande@google.com> Thu Mar 10 17:22:03 2022 +0100
tree 7f4be7766f9a7a87b846ea77da00d7413e7ba9de
parent 1e5cb6752bb9228822adf1e217193e4a62234d08

Revert^2 "Fix bluetooth and aac dependency"

Fix aac dependency

It was merged with ag/17104648
It was reverted with ag/17153588
Merging again ! With the small change this CL could be merged on its own
without the bluetooth changes

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

2602f202a28842e7124b285c594a6186d4746006

Change-Id: I7172d94936e948a96888ae622515e250d513864b

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..5e9597d 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp
@@ -30,8 +30,11 @@
         "external/aac/libSYS/include",
         "external/aac/libAACdec/include",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "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..651c36f 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp
@@ -25,8 +25,11 @@
     srcs : [
         "poc.cpp",
     ],
-    shared_libs : [
-        "libbluetooth",
+    static_libs: [
+        "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..31572ca 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp
@@ -32,7 +32,10 @@
         "external/aac/libFDK/include/",
         "cts/hostsidetests/securitybulletin/securityPatch/includes/",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "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..8834e75 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp
@@ -29,7 +29,10 @@
         "external/aac/libSYS/include",
         "external/aac/libAACdec/include",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "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..56804eb 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp
@@ -30,7 +30,10 @@
         "external/aac/libAACdec/src",
         "external/aac/libSYS/include",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "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..30507a9 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp
@@ -25,8 +25,11 @@
     srcs: [
         "poc.cpp",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "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..cd1a59f 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp
@@ -37,7 +37,10 @@
         "external/aac/libDRCdec/include",
         "external/aac/libSBRdec/src",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "liblog",
     ],
 }