aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCindy Zhou <zhouci@google.com>2021-01-20 23:43:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-20 23:43:35 +0000
commit8aa9b563bd1f683772e521bf333bf09b1102ca73 (patch)
treeddafce3765981a47946faf40a5a9146bc7525486
parentc46a377538dd235ae1f4992dc0b9860316b3f431 (diff)
parent2b3a48d3b7cc9df90f21eb6dcb869b546dd801f5 (diff)
downloadfdk-aac-8aa9b563bd1f683772e521bf333bf09b1102ca73.tar.gz
fdk-aac-8aa9b563bd1f683772e521bf333bf09b1102ca73.tar.bz2
fdk-aac-8aa9b563bd1f683772e521bf333bf09b1102ca73.zip
Merge "aac remove diag" am: f13c7a4054 am: 2b3a48d3b7
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1549588 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6b976c7c29a345e632d25f2e6ac1c2e5ea631b9f
-rw-r--r--Android.bp7
1 files changed, 0 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index f40e05e..c1e8734 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,13 +57,6 @@ cc_library_static {
darwin: {
enabled: false,
},
- android: {
- sanitize: {
- diag: {
- cfi: true,
- },
- },
- },
},
apex_available: [