[PATCH 2/3] libdrm,intel: Add Android makefiles (v2)

[Oliver McFadden]

On Mon, Oct 08, 2012 at 08:50:25AM +0300, Tapani Pälli wrote:
> From: Chad Versace <chad.versace at linux.intel.com>
> 
> This enables libdrm.so and libdrm_intel.so to build on Android
> IceCreamSandwich.
> 
> v2: Link libdrm_intel to libpciaccess.
> 
> Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
Reviewed-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>
> ---
>  Android.mk       | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  intel/Android.mk | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 109 insertions(+)
>  create mode 100644 Android.mk
>  create mode 100644 intel/Android.mk
> 
> diff --git a/Android.mk b/Android.mk
> new file mode 100644
> index 0000000..1029dc6
> --- /dev/null
> +++ b/Android.mk
> @@ -0,0 +1,52 @@
> +#
> +# Copyright © 2011 Intel Corporation
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the "Software"),
> +# to deal in the Software without restriction, including without limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice (including the next
> +# paragraph) shall be included in all copies or substantial portions of the
> +# Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> +# IN THE SOFTWARE.
> +#
> +
> +LIBDRM_VALID_GPU_DRIVERS := i915 i965
> +
> +# Skip this makefile if we're not building for a known GPU.
> +ifneq ($(filter $(BOARD_GPU_DRIVERS), $(LIBDRM_VALID_GPU_DRIVERS)),)
> +
> +LOCAL_PATH := $(call my-dir)
> +include $(CLEAR_VARS)
> +
> +LIBDRM_TOP := $(LOCAL_PATH)
> +
> +# Import variable LIBDRM_SOURCES.
> +include $(LOCAL_PATH)/sources.mk
> +
> +LOCAL_MODULE := libdrm
> +LOCAL_MODULE_TAGS := optional
> +
> +LOCAL_SRC_FILES := $(LIBDRM_SOURCES)
> +
> +LOCAL_C_INCLUDES := \
> +	$(LIBDRM_TOP)/include/drm
> +
> +LOCAL_CFLAGS := \
> +	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
> +
> +include $(BUILD_SHARED_LIBRARY)
> +
> +include $(LOCAL_PATH)/intel/Android.mk
> +
> +endif # BOARD_GPU_DRIVERS
> diff --git a/intel/Android.mk b/intel/Android.mk
> new file mode 100644
> index 0000000..3647a14
> --- /dev/null
> +++ b/intel/Android.mk
> @@ -0,0 +1,57 @@
> +#
> +# Copyright © 2011 Intel Corporation
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the "Software"),
> +# to deal in the Software without restriction, including without limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice (including the next
> +# paragraph) shall be included in all copies or substantial portions of the
> +# Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> +# IN THE SOFTWARE.
> +#
> +
> +LIBDRM_INTEL_VALID_GPU_DRIVERS := i915 i965
> +
> +# Skip this makefile if we're not building for an Intel GPU.
> +ifneq ($(filter $(BOARD_GPU_DRIVERS), $(LIBDRM_INTEL_VALID_GPU_DRIVERS)),)
> +
> +LOCAL_PATH := $(call my-dir)
> +include $(CLEAR_VARS)
> +
> +# Import variable LIBDRM_INTEL_SOURCES.
> +include $(LOCAL_PATH)/sources.mk
> +
> +LOCAL_MODULE := libdrm_intel
> +LOCAL_MODULE_TAGS := optional
> +
> +LOCAL_SHARED_LIBRARIES := libdrm
> +
> +LOCAL_SRC_FILES := $(LIBDRM_INTEL_SOURCES)
> +
> +LOCAL_C_INCLUDES := \
> +	$(LIBDRM_TOP) \
> +	$(LIBDRM_TOP)/intel \
> +	$(LIBDRM_TOP)/include/drm \
> +	external/libpciaccess/include
> +
> +LOCAL_CFLAGS := \
> +	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
> +
> +LOCAL_SHARED_LIBRARIES := \
> +	libdrm \
> +	libpciaccess
> +
> +include $(BUILD_SHARED_LIBRARY)
> +
> +endif # BOARD_GPU_DRIVERS
> -- 
> 1.7.11.7
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Oliver McFadden.