Remove -g from LDFLAGS. Changes for b/20145724 Change-Id: I60164c1f98284bb87c89ffe890ca372ce1e98de6 Reviewed-on: https://swiftshader-review.googlesource.com/2830 Tested-by: Greg Hartman <ghartman@google.com> Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/LLVM/Android.mk b/src/LLVM/Android.mk index dcbf624..2371ef1 100644 --- a/src/LLVM/Android.mk +++ b/src/LLVM/Android.mk
@@ -399,12 +399,11 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libLLVM_swiftshader\" LOCAL_CFLAGS += -fomit-frame-pointer -Os -ffunction-sections -fdata-sections LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -LOCAL_CFLAGS += -std=c++11 -g -LOCAL_LDFLAGS += -g +LOCAL_CFLAGS += -std=c++11 # Android's make system also uses NDEBUG, so we need to set/unset it forcefully -# Uncomment for ON: -LOCAL_CFLAGS += -UNDEBUG +# Uncomment for debug ON: +LOCAL_CFLAGS += -UNDEBUG -g -O0 LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/include-android \
diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk index 1229a37..c85c7bb 100644 --- a/src/OpenGL/libEGL/Android.mk +++ b/src/OpenGL/libEGL/Android.mk
@@ -21,7 +21,7 @@ # Uncomment for ON: LOCAL_CFLAGS += -UNDEBUG -g # Uncomment for OFF: -#LOCAL_CFLAGS += -DNDEBUG -DANGLE_DISABLE_TRACE +#LOCAL_CFLAGS += -DANGLE_DISABLE_TRACE LOCAL_CFLAGS += -std=c++11 @@ -31,7 +31,7 @@ LOCAL_C_INCLUDES += device/google/gce/include LOCAL_SHARED_LIBRARIES += libdl liblog libandroid libutils -LOCAL_LDFLAGS += -Wl,--version-script=$(LOCAL_PATH)/exports.map -Wl,--hash-style=sysv -g +LOCAL_LDFLAGS += -Wl,--version-script=$(LOCAL_PATH)/exports.map -Wl,--hash-style=sysv LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/../include \
diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk index ebf0080..413eb73 100644 --- a/src/OpenGL/libGLES_CM/Android.mk +++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -94,11 +94,11 @@ # Uncomment for ON: LOCAL_CFLAGS += -UNDEBUG -g # Uncomment for OFF: -#LOCAL_CFLAGS += -fomit-frame-pointer -ffunction-sections -fdata-sections -DNDEBUG -DANGLE_DISABLE_TRACE +#LOCAL_CFLAGS += -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE LOCAL_SHARED_LIBRARIES += libdl liblog libcutils libhardware libui libutils LOCAL_STATIC_LIBRARIES += libLLVM_swiftshader -LOCAL_LDFLAGS += -Wl,--gc-sections -Wl,--version-script=$(LOCAL_PATH)/exports.map -Wl,--hash-style=sysv -g +LOCAL_LDFLAGS += -Wl,--gc-sections -Wl,--version-script=$(LOCAL_PATH)/exports.map -Wl,--hash-style=sysv LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/../include \
diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk index d1443e4..f50668d 100644 --- a/src/OpenGL/libGLESv2/Android.mk +++ b/src/OpenGL/libGLESv2/Android.mk
@@ -131,14 +131,14 @@ # Uncomment for ON: LOCAL_CFLAGS += -UNDEBUG -g # Uncomment for OFF: -#LOCAL_CFLAGS += -fomit-frame-pointer -ffunction-sections -fdata-sections -DNDEBUG -DANGLE_DISABLE_TRACE +#LOCAL_CFLAGS += -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS LOCAL_CFLAGS += -std=c++11 LOCAL_SHARED_LIBRARIES += libdl liblog libcutils libhardware libui libutils LOCAL_STATIC_LIBRARIES += libLLVM_swiftshader -LOCAL_LDFLAGS += -Wl,--gc-sections -Wl,--version-script=$(LOCAL_PATH)/exports.map -Wl,--hash-style=sysv -g +LOCAL_LDFLAGS += -Wl,--gc-sections -Wl,--version-script=$(LOCAL_PATH)/exports.map -Wl,--hash-style=sysv LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/../include \