Update Android.bp to generate va_version.h and build only for x86_64

Changes include:
- Updated Android.bp to add license package and enable it only for
x86_64
- Added genrule to generate the va_version.h.
- Removed va_version.h

Signed-off-by: JeevakaPrabu <[email protected]>
Signed-off-by: Andreas Huber <[email protected]>

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,
+        },
+    },
 }

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`