Skip to content

Commit 3da1ba7

Browse files
rosetta-jpnXinfengZhang
authored andcommitted
Remove unnecessary Android code
This patches deletes - vaGetDisplay() in va_android.h - VA_DISPLAY_ANDROID in va_backend.h - libva-android in Android.bp
1 parent e4dc66b commit 3da1ba7

File tree

5 files changed

+2
-217
lines changed

5 files changed

+2
-217
lines changed

Android.bp

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ cc_library_shared {
120120
cflags: [
121121
"-Werror",
122122
"-Winvalid-pch",
123+
"-DANDROID",
123124
"-DSYSCONFDIR=\"/vendor/etc\"",
124125
"-DLOG_TAG=\"libva\"",
125126
],
@@ -134,46 +135,3 @@ cc_library_shared {
134135
vendor: true,
135136
enabled: false,
136137
}
137-
138-
cc_library_shared {
139-
name: "libva-android",
140-
141-
shared_libs: [
142-
"libva",
143-
"libdrm",
144-
"liblog",
145-
],
146-
147-
local_include_dirs: [
148-
"va",
149-
"va/drm",
150-
],
151-
generated_headers: [
152-
"libva_gen_headers",
153-
],
154-
export_generated_headers: [
155-
"libva_gen_headers",
156-
],
157-
export_include_dirs: [
158-
".",
159-
],
160-
161-
srcs: [
162-
"va/android/va_android.cpp",
163-
"va/drm/va_drm_utils.c",
164-
],
165-
166-
cflags: [
167-
"-Werror",
168-
"-Winvalid-pch",
169-
"-DLOG_TAG=\"libva-android\"",
170-
],
171-
172-
vendor: true,
173-
enabled: false,
174-
arch: {
175-
x86_64: {
176-
enabled: true,
177-
},
178-
},
179-
}

va/android/Makefile.am

Lines changed: 0 additions & 24 deletions
This file was deleted.

va/android/va_android.cpp

Lines changed: 0 additions & 134 deletions
This file was deleted.

va/va_android.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,4 @@
3131
/** \brief Android ION buffer memory type. */
3232
#define VA_SURFACE_ATTRIB_MEM_TYPE_ANDROID_ION 0x00200000
3333

34-
#ifdef __cplusplus
35-
extern "C" {
36-
#endif
37-
38-
/*
39-
* Returns a suitable VADisplay for VA API
40-
*/
41-
VADisplay vaGetDisplay(
42-
void *android_dpy
43-
);
44-
45-
#ifdef __cplusplus
46-
}
47-
#endif
48-
4934
#endif /* _VA_ANDROID_H_ */

va/va_backend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ enum {
4444
/** \brief VA/GLX API is used, through vaGetDisplayGLX() entry-point. */
4545
VA_DISPLAY_GLX = (VA_DISPLAY_X11 | (1 << 0)),
4646
/** \brief VA/Android API is used, through vaGetDisplay() entry-point. */
47-
VA_DISPLAY_ANDROID = 0x20,
47+
VA_DISPLAY_ANDROID va_deprecated_enum = 0x20,
4848
/** \brief VA/DRM API is used, through vaGetDisplayDRM() entry-point. */
4949
VA_DISPLAY_DRM = 0x30,
5050
/** \brief VA/DRM API is used, with a render-node device path */

0 commit comments

Comments
 (0)