aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCindy Zhou <zhouci@google.com>2021-01-21 00:02:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-21 00:02:06 +0000
commit0046a43b8b60c29a82af922715a115d9d10e9dab (patch)
treecbcb41656dd45da1fa47f3664868ee4b6b8ddf73
parentcc9b0a4702711f5ae1b17fe6c0b7e60918eb67f0 (diff)
parent8aa9b563bd1f683772e521bf333bf09b1102ca73 (diff)
downloadfdk-aac-0046a43b8b60c29a82af922715a115d9d10e9dab.tar.gz
fdk-aac-0046a43b8b60c29a82af922715a115d9d10e9dab.tar.bz2
fdk-aac-0046a43b8b60c29a82af922715a115d9d10e9dab.zip
Merge "aac remove diag" am: f13c7a4054 am: 2b3a48d3b7 am: 8aa9b563bd
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1549588 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3a49851a5dbdb4487083d20661c7825378a11424
-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: [