Merge branch 'master' into merge-with-upstream

compat/Android.common.mk

@@ -0,0 +1,10 @@
+# define ANDROID_VERSION MAJOR, MINOR and PATCH
+
+ANDROID_VERSION_MAJOR := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
+ANDROID_VERSION_MINOR := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
+ANDROID_VERSION_PATCH := $(word 3, $(subst ., , $(PLATFORM_VERSION)))
+
+LOCAL_CFLAGS += \
+	-DANDROID_VERSION_MAJOR=$(ANDROID_VERSION_MAJOR) \
+	-DANDROID_VERSION_MINOR=$(ANDROID_VERSION_MINOR) \
+	-DANDROID_VERSION_PATCH=$(ANDROID_VERSION_PATCH)

compat/camera/Android.mk

@@ -0,0 +1,63 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/../Android.common.mk
+
+HYBRIS_PATH := $(LOCAL_PATH)/../../hybris
+
+LOCAL_SRC_FILES := camera_compatibility_layer.cpp
+
+LOCAL_MODULE := libcamera_compat_layer
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_C_INCLUDES := \
+	$(HYBRIS_PATH)/include
+
+LOCAL_SHARED_LIBRARIES := \
+	libcutils \
+	libcamera_client \
+	libutils \
+	libbinder \
+	libhardware \
+	libui \
+	libgui
+
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+HYBRIS_PATH := $(LOCAL_PATH)/../../hybris
+
+LOCAL_SRC_FILES := direct_camera_test.cpp
+
+LOCAL_MODULE := direct_camera_test
+LOCAL_MODULE_TAGS := optional
+ifdef TARGET_2ND_ARCH
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE)$(TARGET_2ND_ARCH_MODULE_SUFFIX),$(LOCAL_MODULE))
+LOCAL_MODULE_STEM_64 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE),$(LOCAL_MODULE)_64)
+endif
+
+LOCAL_C_INCLUDES := \
+	$(HYBRIS_PATH)/include \
+	bionic \
+	bionic/libstdc++/include \
+	external/gtest/include \
+	external/stlport/stlport \
+	external/skia/include/core \
+
+LOCAL_SHARED_LIBRARIES := \
+	libis_compat_layer \
+	libsf_compat_layer \
+	libcamera_compat_layer \
+	libmedia_compat_layer \
+	libcutils \
+	libcamera_client \
+	libutils \
+	libbinder \
+	libhardware \
+	libui \
+	libgui \
+	libEGL \
+	libGLESv2
+
+include $(BUILD_EXECUTABLE)