aboutsummaryrefslogtreecommitdiffstats
path: root/Android.bp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-05 16:53:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-09-05 16:53:26 +0000
commitd929f68a05f5cbdd812dca287c8115a39439acf1 (patch)
treefa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /Android.bp
parentc2eb64586d6dfc0f067ea66631b38d1922a106ed (diff)
parenta209adb315f970aa97044a82551a6f5617d61ded (diff)
downloadfdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.tar.gz
fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.tar.bz2
fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.zip
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'Android.bp')
-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",