diff --git a/Android.bp b/Android.bp index 7dc8f10c1..4eeec61c3 100644 --- a/Android.bp +++ b/Android.bp @@ -18,6 +18,36 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +package { + default_applicable_licenses: ["external_intel_libva_license"], +} + +license { + name: "external_intel_libva_license", + visibility: [":__subpackages__"], + license_text: [ + "COPYING", + ], +} + +sh_binary_host { + name: "libva_version_gen_script", + src: "build/gen_version.sh", +} + +genrule { + name: "libva_version_gen", + srcs: [ + "configure.ac", + "va/va_version.h.in", + ], + tools: [ + "libva_version_gen_script", + ], + out: ["va/va_version.h"], + cmd: "$(location libva_version_gen_script) --configure_ac $(in) > $(out)", +} + cc_library_headers { name: "libva_headers", @@ -27,7 +57,20 @@ cc_library_headers { "va/drm" ], + generated_headers: [ + "libva_version_gen", + ], + export_generated_headers: [ + "libva_version_gen", + ], + vendor: true, + enabled: false, + arch: { + x86_64: { + enabled: true, + }, + }, } cc_library_shared { @@ -45,12 +88,15 @@ cc_library_shared { "va" ], - header_libs: [ - "libutils_headers", + generated_headers: [ + "libva_version_gen", + ], + export_generated_headers: [ + "libva_version_gen", ], - export_include_dirs: [ - ".", + header_libs: [ + "libutils_headers", ], srcs: [ @@ -70,15 +116,14 @@ cc_library_shared { ], arch: { - x86: { - cflags: ["-DVA_DRIVERS_PATH=\"/vendor/lib\""], - }, x86_64: { cflags: ["-DVA_DRIVERS_PATH=\"/vendor/lib64\""], + enabled: true, }, }, vendor: true, + enabled: false, } cc_library_shared { @@ -104,9 +149,6 @@ cc_library_shared { "libutils_headers", ], - include_dirs: [ - ], - srcs: [ "va/android/va_android.cpp", "va/drm/va_drm_utils.c", @@ -119,4 +161,10 @@ cc_library_shared { ], vendor: true, + enabled: false, + arch: { + x86_64: { + enabled: true, + }, + }, } diff --git a/build/gen_version.sh b/build/gen_version.sh index 8864f7d29..4c7204b2a 100644 --- a/build/gen_version.sh +++ b/build/gen_version.sh @@ -26,17 +26,25 @@ libva_topdir="$1" version_h_in="$2" parse_configure_ac() { - sed -n "/^m4_define.*${1}.*\[\([0-9]*\)\].*/s//\1/p" ${libva_topdir}/configure.ac + sed -n "/^m4_define.*${1}.*\[\([0-9]*\)\].*/s//\1/p" ${2} } parse_configure() { sed -n "/^${1}=\([0-9]*\)/s//\1/p" ${libva_topdir}/configure } -if test -f "${libva_topdir}/configure.ac"; then - va_api_major_version=`parse_configure_ac va_api_major_version` - va_api_minor_version=`parse_configure_ac va_api_minor_version` - va_api_micro_version=`parse_configure_ac va_api_micro_version` +if [ "$1" = "--configure_ac" ]; then + # $2 specifies the path to configure.ac, $3 the path to version.h.in + libva_topdir="///" + version_h_in="$3" + va_api_major_version=`parse_configure_ac va_api_major_version $2` + va_api_minor_version=`parse_configure_ac va_api_minor_version $2` + va_api_micro_version=`parse_configure_ac va_api_micro_version $2` +elif test -f "${libva_topdir}/configure.ac"; then + CONFIGURE_AC_PATH=${libva_topdir}/configure.ac + va_api_major_version=`parse_configure_ac va_api_major_version $CONFIGURE_AC_PATH` + va_api_minor_version=`parse_configure_ac va_api_minor_version $CONFIGURE_AC_PATH` + va_api_micro_version=`parse_configure_ac va_api_micro_version $CONFIGURE_AC_PATH` elif test -f "${libva_topdir}/configure"; then va_api_major_version=`parse_configure VA_API_MAJOR_VERSION` va_api_minor_version=`parse_configure VA_API_MINOR_VERSION` diff --git a/va/va_version.h b/va/va_version.h deleted file mode 100644 index 47983dae9..000000000 --- a/va/va_version.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved. - * - * 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, sub license, 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 NON-INFRINGEMENT. - * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. - */ - -#ifndef VA_VERSION_H -#define VA_VERSION_H - -/** - * VA_MAJOR_VERSION: - * - * The major version of VA-API (1, if %VA_VERSION is 1.2.3) - */ -#define VA_MAJOR_VERSION 2 - -/** - * VA_MINOR_VERSION: - * - * The minor version of VA-API (2, if %VA_VERSION is 1.2.3) - */ -#define VA_MINOR_VERSION 21 - -/** - * VA_MICRO_VERSION: - * - * The micro version of VA-API (3, if %VA_VERSION is 1.2.3) - */ -#define VA_MICRO_VERSION 0 - -/** - * VA_VERSION: - * - * The full version of VA-API, like 1.2.3 - */ -#define VA_VERSION 2.21.0 - -/** - * VA_VERSION_S: - * - * The full version of VA-API, in string form (suited for string - * concatenation) - */ -#define VA_VERSION_S "2.21.0" - -/** - * VA_VERSION_HEX: - * - * Numerically encoded version of VA-API, like 0x010203 - */ -#define VA_VERSION_HEX ((VA_MAJOR_VERSION << 24) | \ - (VA_MINOR_VERSION << 16) | \ - (VA_MICRO_VERSION << 8)) - -/** - * VA_CHECK_VERSION: - * @major: major version, like 1 in 1.2.3 - * @minor: minor version, like 2 in 1.2.3 - * @micro: micro version, like 3 in 1.2.3 - * - * Evaluates to %TRUE if the version of VA-API is greater than - * @major, @minor and @micro - */ -#define VA_CHECK_VERSION(major,minor,micro) \ - (VA_MAJOR_VERSION > (major) || \ - (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION > (minor)) || \ - (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION == (minor) && VA_MICRO_VERSION >= (micro))) - -#endif /* VA_VERSION_H */ -