Remove unnecessary Android code

This patches deletes - vaGetDisplay() in va_android.h - VA_DISPLAY_ANDROID in va_backend.h - libva-android in Android.bp
intel · Dec 4, 2024 · 117e1d8 · 117e1d8
1 parent e4dc66b
commit 117e1d8
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 217 deletions.
diff --git a/Android.bp b/Android.bp
@@ -120,6 +120,7 @@ cc_library_shared {
     cflags: [
         "-Werror",
         "-Winvalid-pch",
+        "-DANDROID",
         "-DSYSCONFDIR=\"/vendor/etc\"",
         "-DLOG_TAG=\"libva\"",
     ],
@@ -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,
-        },
-    },
-}
diff --git a/va/android/Makefile.am b/va/android/Makefile.am
diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp
diff --git a/va/va_android.h b/va/va_android.h
@@ -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_ */
diff --git a/va/va_backend.h b/va/va_backend.h
@@ -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 */