aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2020-07-30 21:07:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-30 21:07:48 +0000
commitbc9b8380ccf31b0ed6bd61bafaeb2f8aa3c8744b (patch)
tree85a62af486e9af44345b062aab77e4dbf6fd16b5
parent8c822a4825f8a9acf097e8c8d87e039935c2fe52 (diff)
parent49f6f6562feac9be722a11111e0bf44d97310318 (diff)
downloadlibaom-bc9b8380ccf31b0ed6bd61bafaeb2f8aa3c8744b.tar.gz
Use blocklist sub-property in sanitize am: 49f6f6562f
Original change: https://android-review.googlesource.com/c/platform/external/libaom/+/1375460 Change-Id: I525f6896d55491582cae107f9854500ef3de2a85
-rw-r--r--Android.bp2
-rw-r--r--Android.bp.in2
-rw-r--r--libaom_blocklist.txt (renamed from libaom_blacklist.txt)0
3 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index a54136bae..626266861 100644
--- a/Android.bp
+++ b/Android.bp
@@ -519,7 +519,7 @@ cc_library_static {
},
sanitize: {
- blacklist: "libaom_blacklist.txt",
+ blocklist: "libaom_blocklist.txt",
},
}
diff --git a/Android.bp.in b/Android.bp.in
index 3d9c5c673..6d4863be0 100644
--- a/Android.bp.in
+++ b/Android.bp.in
@@ -107,7 +107,7 @@ cc_library_static {
},
sanitize: {
- blacklist: "libaom_blacklist.txt",
+ blocklist: "libaom_blocklist.txt",
},
}
diff --git a/libaom_blacklist.txt b/libaom_blocklist.txt
index 07b390430..07b390430 100644
--- a/libaom_blacklist.txt
+++ b/libaom_blocklist.txt