X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Android.common.mk;h=e8b900697f3e8d7a233c4e68fe790f55bd877b96;hb=5a74e17ab0f5ec864c18bc74f951e18d3ecc136f;hp=83177a0cbe7ccc87199f6f0c37da7281677d0593;hpb=6571c0774af1f5ebd0fab40bf4769702d3c9ded5;p=mesa.git

diff --git a/Android.common.mk b/Android.common.mk
index 83177a0cbe7..e8b900697f3 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -21,9 +21,24 @@
 # 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
 
+# define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
+major := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
+minor := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
+LOCAL_CFLAGS += \
+	-DANDROID_VERSION=0x0$(major)0$(minor)
+
 LOCAL_CFLAGS += \
 	-DPTHREADS \
 	-fvisibility=hidden \