Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary Android code #842

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove unnecessary Android code #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 1 addition & 43 deletions Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ cc_library_shared {
cflags: [
"-Werror",
"-Winvalid-pch",
"-DANDROID",
"-DSYSCONFDIR=\"/vendor/etc\"",
"-DLOG_TAG=\"libva\"",
],
Expand All @@ -134,46 +135,3 @@ cc_library_shared {
vendor: true,
enabled: false,
}

cc_library_shared {
name: "libva-android",

shared_libs: [
"libva",
"libdrm",
"liblog",
],

local_include_dirs: [
"va",
"va/drm",
],
generated_headers: [
"libva_gen_headers",
],
export_generated_headers: [
"libva_gen_headers",
],
export_include_dirs: [
".",
],

srcs: [
"va/android/va_android.cpp",
"va/drm/va_drm_utils.c",
],

cflags: [
"-Werror",
"-Winvalid-pch",
"-DLOG_TAG=\"libva-android\"",
],

vendor: true,
enabled: false,
arch: {
x86_64: {
enabled: true,
},
},
}
24 changes: 0 additions & 24 deletions va/android/Makefile.am
View file
Open in desktop

This file was deleted.

134 changes: 0 additions & 134 deletions va/android/va_android.cpp
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions va/va_android.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,4 @@
/** \brief Android ION buffer memory type. */
#define VA_SURFACE_ATTRIB_MEM_TYPE_ANDROID_ION 0x00200000

#ifdef __cplusplus
extern "C" {
#endif

/*
* Returns a suitable VADisplay for VA API
*/
VADisplay vaGetDisplay(
void *android_dpy
);

#ifdef __cplusplus
}
#endif

#endif /* _VA_ANDROID_H_ */
2 changes: 1 addition & 1 deletion va/va_backend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ enum {
/** \brief VA/GLX API is used, through vaGetDisplayGLX() entry-point. */
VA_DISPLAY_GLX = (VA_DISPLAY_X11 | (1 << 0)),
/** \brief VA/Android API is used, through vaGetDisplay() entry-point. */
VA_DISPLAY_ANDROID = 0x20,
VA_DISPLAY_ANDROID va_deprecated_enum = 0x20,
/** \brief VA/DRM API is used, through vaGetDisplayDRM() entry-point. */
VA_DISPLAY_DRM = 0x30,
/** \brief VA/DRM API is used, with a render-node device path */
Expand Down
Loading