Merge remote-tracking branch 'morphis/mm-support'

debian/libhybris-utils.install

@@ -1,2 +1,3 @@
 usr/bin/getprop
 usr/bin/setprop
+utils/load_sym_files.py usr/share/libhybris/gdb/

debian/libhybris.install.in

@@ -12,3 +12,4 @@ usr/lib/*/libhybris/*.so
 usr/lib/*/libwayland-egl.so.*		#PKGLIBDIR#
 usr/lib/*/libEGL.so.*		#PKGLIBDIR#
 usr/lib/*/libGLESv2.so.*	#PKGLIBDIR#
+usr/lib/*/libGLESv1_CM.so.*	#PKGLIBDIR#

debian/rules

@@ -87,11 +87,14 @@ ARCH_CONFIGURATION =
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armhf))
 ARCH_CONFIGURATION = \
 	--enable-arch=arm \
-	--enable-mali-quirks
+	--enable-mali-quirks \
+	--enable-experimental
 endif
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), arm64))
 ARCH_CONFIGURATION = \
-	--enable-stub-linker
+	--enable-arch=arm64 \
+	--enable-mali-quirks \
+	--enable-experimental
 endif
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), i386))
 ARCH_CONFIGURATION = \

hybris/common/Makefile.am

@@ -5,6 +5,10 @@ if WANT_STUB_LINKER
 SUBDIRS = stub
 libhybris_common_la_LIBADD = stub/libstub-linker.la
 else
+if WANT_EXPERIMENTAL
+SUBDIRS = mm
+libhybris_common_la_LIBADD = mm/libandroid-linker.la
+else
 # JB linker works fine for ICS
 if HAS_ANDROID_4_0_0
 SUBDIRS = jb
@@ -23,30 +27,34 @@ endif
 endif
 endif
 endif
+endif
 
 libhybris_common_la_SOURCES = \
 	hooks.c \
 	hooks_shm.c \
 	strlcpy.c \
+	strlcat.c \
 	dlfcn.c \
 	logging.c \
 	sysconf.c
-libhybris_common_la_CFLAGS = \
+libhybris_common_la_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	$(ANDROID_HEADERS_CFLAGS) \
 	-I$(top_srcdir)/common
 if WANT_TRACE
-libhybris_common_la_CFLAGS += -DDEBUG
+libhybris_common_la_CPPFLAGS += -DDEBUG
 endif
 if WANT_DEBUG
-libhybris_common_la_CFLAGS += -ggdb -O0
+libhybris_common_la_CPPFLAGS += -ggdb -O0
 endif
 if WANT_MALI_QUIRKS
-libhybris_common_la_CFLAGS += -DMALI_QUIRKS
+libhybris_common_la_CPPFLAGS += -DMALI_QUIRKS
 endif
 libhybris_common_la_LDFLAGS = \
 	-ldl \
 	-lrt \
 	-pthread \
+	-lc \
+	-lstdc++ \
 	$(top_builddir)/properties/libandroid-properties.la \
 	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"