From bb812934f8ac5b8eaf7392f2ded008a690e93b58 Mon Sep 17 00:00:00 2001
From: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
Date: Wed, 25 Sep 2024 08:25:55 +0000
Subject: [PATCH] Add Android.bp for libva 2.22

Changes include:
- Updated Android.bp to add license package and enable it only for
x86_64
- Updated .gitignore to remove va_version.h from files to ignore

Signed-off-by: JeevakaPrabu <jeevaka.badrappan@intel.com>
---
 .gitignore      |  1 -
 Android.bp      | 54 +++++++++++++++++++++++--------------------------
 va/va_version.h |  6 +++---
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18d0234bb..e63b8ed0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ ltmain.sh
 /m4
 missing
 stamp-h1
-/va/va_version.h
 /va/wayland/wayland-drm-client-protocol.*
 /doc/Doxyfile
 /doc/html-out
diff --git a/Android.bp b/Android.bp
index 7dc8f10c1..bedf5574e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,22 +1,14 @@
-// Copyright (c) 2017-2023 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 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.
+package {
+    default_applicable_licenses: ["external_intel_libva_license"],
+}
+
+license {
+    name: "external_intel_libva_license",
+    visibility: [":__subpackages__"],
+    license_text: [
+        "COPYING",
+    ],
+}
 
 cc_library_headers {
     name: "libva_headers",
@@ -28,6 +20,12 @@ cc_library_headers {
     ],
 
     vendor: true,
+    enabled: false,
+    arch: {
+        x86_64: {
+            enabled: true,
+        },
+    },
 }
 
 cc_library_shared {
@@ -49,10 +47,6 @@ cc_library_shared {
         "libutils_headers",
     ],
 
-    export_include_dirs: [
-        ".",
-    ],
-
     srcs: [
         "va/va.c",
         "va/va_trace.c",
@@ -70,15 +64,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 +97,6 @@ cc_library_shared {
         "libutils_headers",
     ],
 
-    include_dirs: [
-    ],
-
     srcs: [
         "va/android/va_android.cpp",
         "va/drm/va_drm_utils.c",
@@ -119,4 +109,10 @@ cc_library_shared {
     ],
 
     vendor: true,
+    enabled: false,
+    arch: {
+        x86_64: {
+            enabled: true,
+        },
+    },
 }
diff --git a/va/va_version.h b/va/va_version.h
index 47983dae9..6b8cfcd5c 100644
--- a/va/va_version.h
+++ b/va/va_version.h
@@ -37,7 +37,7 @@
  *
  * The minor version of VA-API (2, if %VA_VERSION is 1.2.3)
  */
-#define VA_MINOR_VERSION    21
+#define VA_MINOR_VERSION    22
 
 /**
  * VA_MICRO_VERSION:
@@ -51,7 +51,7 @@
  *
  * The full version of VA-API, like 1.2.3
  */
-#define VA_VERSION          2.21.0
+#define VA_VERSION          2.22.0
 
 /**
  * VA_VERSION_S:
@@ -59,7 +59,7 @@
  * The full version of VA-API, in string form (suited for string
  * concatenation)
  */
-#define VA_VERSION_S       "2.21.0"
+#define VA_VERSION_S       "2.22.0"
 
 /**
  * VA_VERSION_HEX: