resolve merge conflicts of d6f04bfbc2 to rvc-dev-plus-aosp am: 1713b4bfea am: f44a5a1898 am: 834c57586a

Original change: 12273973 Change-Id: Ibbb6b6529ad0c599baaea427805287a172a63eb1
2020-07-31 00:11:43 +00:00 · 2020-07-31 00:11:43 +00:00 · 35bc695d7b
commit 35bc695d7b
parent c4bfa0c185 834c57586a
2 changed files with 1 additions and 1 deletions
--- a/Android.bp
+++ b/Android.bp
@ -132,7 +132,7 @@ cc_library_static {
        ],
        // Enable CFI if this becomes a shared library.
        // cfi: true,
-        blacklist: "libxaac_blacklist.txt",
+        blocklist: "libxaac_blocklist.txt",
    },

    arch: {
--- a/libxaac_blocklist.txt
+++ b/libxaac_blocklist.txt