From 6a39cdb6eef730d848a9f0a15d7506bc9c00ef78 Mon Sep 17 00:00:00 2001
From: Harish Mahendrakar <harish.mahendrakar@ittiam.com>
Date: Wed, 9 Jan 2019 14:01:08 -0800
Subject: 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
---
 Android.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Android.bp')

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",
-- 
cgit v1.2.3