reconcile aosp (8689b90bcf) after branching. Please do not merge.

Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161
This commit is contained in:
Ed Heyl 2014-07-14 23:32:28 -07:00
parent 4f892ab728
commit f6771f631b
2 changed files with 2 additions and 2 deletions

View file

@ -112,7 +112,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
-Werror=format-security \ -Werror=format-security \
-D_FORTIFY_SOURCE=2 \ -D_FORTIFY_SOURCE=2 \
-Wstrict-aliasing=2 \ -Wstrict-aliasing=2 \
-fPIC -fPIE \ -fPIC \
-ffunction-sections \ -ffunction-sections \
-finline-functions \ -finline-functions \
-finline-limit=300 \ -finline-limit=300 \

View file

@ -110,7 +110,7 @@ TARGET_GLOBAL_CFLAGS += \
-Werror=format-security \ -Werror=format-security \
-D_FORTIFY_SOURCE=2 \ -D_FORTIFY_SOURCE=2 \
-Wstrict-aliasing=2 \ -Wstrict-aliasing=2 \
-fPIC -fPIE \ -fPIC \
-ffunction-sections \ -ffunction-sections \
-finline-functions \ -finline-functions \
-finline-limit=300 \ -finline-limit=300 \