diff options
| author | Stephen Hines <srhines@google.com> | 2016-03-28 23:53:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-28 23:53:55 +0000 |
| commit | e9a6e6747c0ecbb560569750e65efb5fd6191998 (patch) | |
| tree | f9095b1cdf112bdba7aec105e1ea0b1b3d334558 /support | |
| parent | 4f4ced8c52c75346a9c6a34ab7b5374c78d2a51a (diff) | |
| parent | 413c30f6bd7488c3ee1e83a0127cd87e8d1c9385 (diff) | |
| download | rs-e9a6e6747c0ecbb560569750e65efb5fd6191998.tar.gz | |
Merge "Turn FORTIFY back on for the RS support library." am: cfc67d1
am: db902fe
* commit 'db902fec2a919444238c745fb85aeb2e74b5ff99':
Turn FORTIFY back on for the RS support library.
Diffstat (limited to 'support')
| -rw-r--r-- | support/jni/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support/jni/Android.mk b/support/jni/Android.mk index 2d382b13..d6a800d5 100644 --- a/support/jni/Android.mk +++ b/support/jni/Android.mk @@ -14,7 +14,7 @@ LOCAL_C_INCLUDES += \ frameworks/rs/cpp \ frameworks/rs/driver -LOCAL_CFLAGS += -Wno-unused-parameter -U_FORTIFY_SOURCE -Werror +LOCAL_CFLAGS += -Wno-unused-parameter -Werror LOCAL_CFLAGS += -DRS_COMPATIBILITY_LIB -std=c++11 LOCAL_MODULE:= libRSSupportIO @@ -44,7 +44,7 @@ LOCAL_C_INCLUDES += \ frameworks/rs \ frameworks/rs/cpp -LOCAL_CFLAGS += -Wno-unused-parameter -U_FORTIFY_SOURCE -Werror -std=c++11 +LOCAL_CFLAGS += -Wno-unused-parameter -Werror -std=c++11 LOCAL_MODULE:= librsjni LOCAL_MODULE_TAGS := optional |