Skip to content

Commit

Permalink
Add Android.bp for libva 2.22
Browse files Browse the repository at this point in the history
Changes include:
- Updated Android.bp to add license package and enable it only for
x86_64
- Symbolic link LICENSE to COPYING file.
- Updated .gitignore to remove va_version.h from files to ignore

Signed-off-by: JeevakaPrabu <[email protected]>
  • Loading branch information
JeevakaPrabu committed Sep 25, 2024
1 parent 288acbf commit 1fb64fd
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 33 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
54 changes: 25 additions & 29 deletions Android.bp
Original file line number Diff line number Diff line change
@@ -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: [
"LICENSE",
],
}

cc_library_headers {
name: "libva_headers",
Expand All @@ -28,6 +20,12 @@ cc_library_headers {
],

vendor: true,
enabled: false,
arch: {
x86_64: {
enabled: true,
},
},
}

cc_library_shared {
Expand All @@ -49,10 +47,6 @@ cc_library_shared {
"libutils_headers",
],

export_include_dirs: [
".",
],

srcs: [
"va/va.c",
"va/va_trace.c",
Expand All @@ -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 {
Expand All @@ -104,9 +97,6 @@ cc_library_shared {
"libutils_headers",
],

include_dirs: [
],

srcs: [
"va/android/va_android.cpp",
"va/drm/va_drm_utils.c",
Expand All @@ -119,4 +109,10 @@ cc_library_shared {
],

vendor: true,
enabled: false,
arch: {
x86_64: {
enabled: true,
},
},
}
1 change: 1 addition & 0 deletions LICENSE
6 changes: 3 additions & 3 deletions va/va_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -51,15 +51,15 @@
*
* 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:
*
* 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:
Expand Down

0 comments on commit 1fb64fd

Please sign in to comment.