From 0c6568e4f9c1d3960f08b08ca6a679cf62806e49 Mon Sep 17 00:00:00 2001
From: Muhammad <77672824+muhammad23012009@users.noreply.github.com>
Date: Sun, 9 Jul 2023 21:59:30 +0500
Subject: [PATCH 1/3] va/Android.mk: define SYSCONFDIR

* defined to /system/etc by default, since anyone building libva-android can install a configuration file there.
---
 va/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/va/Android.mk b/va/Android.mk
index a8f05f149..aea3f7c73 100644
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -51,6 +51,7 @@ LOCAL_CFLAGS_64 += \
 
 LOCAL_CFLAGS := \
 	$(IGNORED_WARNNING) \
+	-DSYSCONFDIR=\"/system/etc\" \
 	-DLOG_TAG=\"libva\"
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..

From 63e2f3767b4b99c44e4c3b74c4c9809f3a2fc7a0 Mon Sep 17 00:00:00 2001
From: Muhammad <77672824+muhammad23012009@users.noreply.github.com>
Date: Sun, 9 Jul 2023 22:02:59 +0500
Subject: [PATCH 2/3] va/Android.mk: Install libraries in /system instead

* These libraries aren't exactly supposed to end up in /vendor, https://source.android.com/docs/core/architecture/vndk defined here. Only vendor specific items are supposed to be in /vendor.
---
 va/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/va/Android.mk b/va/Android.mk
index aea3f7c73..0dec02b8d 100644
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -25,8 +25,8 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-LIBVA_DRIVERS_PATH_32 := /vendor/lib/dri
-LIBVA_DRIVERS_PATH_64 := /vendor/lib64/dri
+LIBVA_DRIVERS_PATH_32 := /system/lib/dri
+LIBVA_DRIVERS_PATH_64 := /system/lib64/dri
 
 include $(CLEAR_VARS)
 

From 75159d53dd05e3bbc84db3af9e85875366b5247e Mon Sep 17 00:00:00 2001
From: Muhammad <77672824+muhammad23012009@users.noreply.github.com>
Date: Sun, 9 Jul 2023 22:18:46 +0500
Subject: [PATCH 3/3] va/Android.mk: don't build libva{_android} as proprietary
 module

* Allows libva-utils to compile with libva-android as well
---
 va/Android.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/va/Android.mk b/va/Android.mk
index 0dec02b8d..b70497f41 100644
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -59,7 +59,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils liblog
 
@@ -96,7 +95,6 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva-android
-LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_SHARED_LIBRARIES := libva libdrm liblog