aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2019-01-09 14:01:08 -0800
committerWonsik Kim <wonsik@google.com>2019-01-18 16:37:25 -0800
commit6a39cdb6eef730d848a9f0a15d7506bc9c00ef78 (patch)
tree3151ed92910bc2c22399019d29aae51ae1de2f03
parent2a2c62fbed2e76125a7a48aed6b6ea2d09eabf7b (diff)
downloadfdk-aac-6a39cdb6eef730d848a9f0a15d7506bc9c00ef78.tar.gz
fdk-aac-6a39cdb6eef730d848a9f0a15d7506bc9c00ef78.tar.bz2
fdk-aac-6a39cdb6eef730d848a9f0a15d7506bc9c00ef78.zip
Don't explicitly enable CFI in libFraunhoferAAC
Since libFraunhoferAAC is a static library, both CFI and non-CFI variants will be built and linked accordingly. If it is used as a shared library in the future, we'll need to explicitly re-enable CFI in the build file. Bug: 117994055 Change-Id: I825c53b5f895e00c1fb9357c573b6b5c2261c743
-rw-r--r--Android.bp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index dce6fdd..80a0347 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,7 +30,8 @@ cc_library_static {
"signed-integer-overflow",
"bounds",
],
- cfi: true,
+ // Enable CFI if this becomes a shared library.
+ // cfi: true,
},
shared_libs: [
"liblog",