Merge ~ondrak/libhybris/+git/libhybris:phablet-5.x into ~libhybris-maintainers/libhybris/+git/libhybris:stable

[Ondrej Kubik]

Adding changes to support Android 5.x
 - Compiling test_audio only with non Android 5 headers
 - Adding test_egl_init test
 - Fixing compile error for media recorder in Anroid 5.x

[You-Sheng Yang (vicamo)]

Besides, I don't think anyone should propose a merge into the stable branch.

review: Needs Fixing

[Simon Fels (morphis)]

I've fixed the media api differences in https://code.launchpad.net/~morphis/libhybris/+git/libhybris-ubuntu/+merge/281828

Unmerged commits

17952e7... by Ondrej Kubik on 2015-12-23

Compiling test_audio only with non Android 5 headers

Signed-off-by: Ondrej Kubik <email address hidden>

e618eb5... by Ondrej Kubik on 2015-12-23

Adding test_egl_init test

Signed-off-by: Ondrej Kubik <email address hidden>

7e919d5... by Ondrej Kubik on 2015-12-23

Fixing compile error for media recorder in Anroid 5.x

Signed-off-by: Ondrej Kubik <email address hidden>

diff --git a/compat/media/media_recorder_client.cpp b/compat/media/media_recorder_client.cpp
index 896bec8..bcaf886 100644
--- a/compat/media/media_recorder_client.cpp
+++ b/compat/media/media_recorder_client.cpp
@@ -254,6 +254,7 @@ status_t MediaRecorderClient::stop()
     return recorder->stop();
 }
 
+#if ANDROID_VERSION_MAJOR==4
 status_t MediaRecorderClient::pause()
 {
     REPORT_FUNCTION();
@@ -265,6 +266,7 @@ status_t MediaRecorderClient::pause()
     return recorder->pause();
 
 }
+#endif
 
 status_t MediaRecorderClient::reset()
 {
diff --git a/compat/media/media_recorder_client.h b/compat/media/media_recorder_client.h
index d5c3eb6..a165e65 100644
--- a/compat/media/media_recorder_client.h
+++ b/compat/media/media_recorder_client.h
@@ -60,7 +60,9 @@ public:
     virtual status_t getMaxAmplitude(int* max);
     virtual status_t start();
     virtual status_t stop();
+#if ANDROID_VERSION_MAJOR==4
     virtual status_t pause();
+#endif
     virtual status_t reset();
     virtual status_t init();
     virtual status_t close();
diff --git a/hybris/tests/Makefile.am b/hybris/tests/Makefile.am
index 7ed6335..a2b4d69 100644
--- a/hybris/tests/Makefile.am
+++ b/hybris/tests/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = \
-	test_audio \
 	test_egl \
+	test_egl_init \
 	test_egl_configs \
 	test_glesv2 \
 	test_ui \
@@ -15,6 +15,11 @@ bin_PROGRAMS = \
 	test_gps \
 	test_wifi
 
+if !HAS_ANDROID_5_0_0
+bin_PROGRAMS += \
+		test_audio
+endif
+
 if HAS_ANDROID_4_2_0
 bin_PROGRAMS += test_hwcomposer
 endif
@@ -33,6 +38,7 @@ endif
 # bin_PROGRAMS += test_audio 
 # endif
 
+if !HAS_ANDROID_5_0_0
 test_audio_SOURCES = test_audio.c
 test_audio_CFLAGS = \
 	-I$(top_srcdir)/include \
@@ -40,6 +46,7 @@ test_audio_CFLAGS = \
 test_audio_LDADD = \
 	$(top_builddir)/common/libhybris-common.la \
 	$(top_builddir)/hardware/libhardware.la
+endif
 
 test_egl_SOURCES = test_egl.c
 test_egl_CFLAGS = \
@@ -62,6 +69,15 @@ test_egl_configs_LDADD = \
 	$(top_builddir)/common/libhybris-common.la \
 	$(top_builddir)/egl/libEGL.la
 
+test_egl_init_SOURCES = test_egl_init.c
+test_egl_init_CFLAGS = \
+	-I$(top_srcdir)/include \
+	$(ANDROID_HEADERS_CFLAGS) \
+	-I$(top_srcdir)/egl/platforms/common
+test_egl_init_LDADD = \
+	$(top_builddir)/common/libhybris-common.la \
+	$(top_builddir)/egl/libEGL.la
+
 test_glesv2_SOURCES = test_glesv2.c
 test_glesv2_CFLAGS = \
 	-I$(top_srcdir)/include \
diff --git a/hybris/tests/test_egl_init.c b/hybris/tests/test_egl_init.c
new file mode 100644
index 0000000..1403c12
--- /dev/null
+++ b/hybris/tests/test_egl_init.c
@@ -0,0 +1,31 @@
+/*
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+#include <EGL/egl.h>
+#include <stdio.h>
+#include <unistd.h>
+
+int main(int argc, char **argv)
+{
+    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    printf("eglGetDisplay returns %p\n", display);
+
+    EGLint major = 0, minor = 0;
+    EGLBoolean rc = eglInitialize(display, &major, &minor);
+    printf("eglInitialize returns %i\n", rc);
+
+    sleep(10);
+    return 0;
+}
\ No newline at end of file