projects
/
profile
/
ivi
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix spec file %post and %postun scriptlets (resolves TIVI-234)
[profile/ivi/mesa.git]
/
Android.common.mk
diff --git
a/Android.common.mk
b/Android.common.mk
index
83177a0
..
18e5726
100644
(file)
--- a/
Android.common.mk
+++ b/
Android.common.mk
@@
-21,18
+21,35
@@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
# 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
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 += \
LOCAL_CFLAGS += \
- -DPTHREADS \
+ -DANDROID_VERSION=0x0$(major)0$(minor)
+
+LOCAL_CFLAGS += \
+ -DHAVE_PTHREAD=1 \
-fvisibility=hidden \
-Wno-sign-compare
ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86)
LOCAL_CFLAGS += \
-fvisibility=hidden \
-Wno-sign-compare
ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86)
LOCAL_CFLAGS += \
- -DUSE_X86_ASM
+ -DUSE_X86_ASM \
+ -DHAVE_DLOPEN \
+
endif
endif
endif
endif