Remove useless checks for NULL before freeing

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index f28ddc2ef66dd9eb048af7ee491c37d3ba57dcb7..1e9f040ac078ccd93a5cbda2eb45a2faaf510497 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -21,6 +21,15 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+# use c99 compiler by default
+ifeq ($(LOCAL_CC),)
+ifeq ($(LOCAL_IS_HOST_MODULE),true)
+LOCAL_CC := $(HOST_CC) -std=c99
+else
+LOCAL_CC := $(TARGET_CC) -std=c99
+endif
+endif
+
 LOCAL_C_INCLUDES += \
        $(MESA_TOP)/include
 
@@ -38,7 +47,9 @@ LOCAL_CFLAGS += \
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
-       -DUSE_X86_ASM
+       -DUSE_X86_ASM \
+       -DHAVE_DLOPEN \
+
 endif
 endif