display: More fixes for VNDK
Change-Id: I8887ffdde3d6f39f9405dd38e8eaedbb8da2a9b4
diff --git a/Android.bp b/Android.bp
index 348067f..41fe269 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,7 @@
cc_library_headers {
name: "display_headers",
+ vendor_available: true,
export_include_dirs: [
"include",
"libcopybit",
diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk
index 89bad79..6c6ccd1 100644
--- a/gpu_tonemapper/Android.mk
+++ b/gpu_tonemapper/Android.mk
@@ -13,7 +13,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/qcom/display/
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libui libutils liblog
+LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libGLESv3 libui libutils liblog
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
LOCAL_CFLAGS := $(version_flag) -Wno-missing-field-initializers -Wall \
diff --git a/gralloc/service.cpp b/gralloc/service.cpp
index b19cc88..5832386 100644
--- a/gralloc/service.cpp
+++ b/gralloc/service.cpp
@@ -26,7 +26,6 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <binder/ProcessState.h>
#include <hidl/LegacySupport.h>
#include "QtiAllocator.h"
diff --git a/libqdutils/Android.bp b/libqdutils/Android.bp
index a32162f..3166a4f 100644
--- a/libqdutils/Android.bp
+++ b/libqdutils/Android.bp
@@ -2,6 +2,10 @@
name: "libqdutils",
vendor: true,
defaults: ["display_defaults"],
+ header_libs: [
+ "libhardware_headers",
+ "libutils_headers",
+ ],
shared_libs: [
"libbinder",
"libqservice",
@@ -24,7 +28,10 @@
"-Wno-sign-conversion",
"-DLOG_TAG=\"qdmetadata\"",
],
- srcs: ["qdMetaData.cpp","qd_utils.cpp"],
+ srcs: [
+ "qdMetaData.cpp",
+ "qd_utils.cpp",
+ ],
}
// Remove after WFD moves to use libqdMetaData directly
@@ -35,5 +42,8 @@
"-Wno-sign-conversion",
"-DLOG_TAG=\"qdmetadata\"",
],
- srcs: ["qdMetaData.cpp","qd_utils.cpp"],
+ srcs: [
+ "qdMetaData.cpp",
+ "qd_utils.cpp",
+ ],
}