commit c4fdf73cfbf86aebc7f39c3d811a4b46aaa80e1d
author Linux Build Service Account <lnxbuild@localhost> Sat Mar 03 04:28:11 2018 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Mar 03 04:28:11 2018 -0800
tree cbfc868871299fce72d4a13deb2166250171bbc5
parent b1c29b379ad9c8b9c0d32a51eb795e5af05bb387
parent 62dd96c7a76e9a67f871818a5223476520aeff0f

Merge "gralloc: Use default interfaces of allocator/mapper"

libdisplayconfig/Android.mk

diff --git a/libdisplayconfig/Android.mk b/libdisplayconfig/Android.mk
index a107ea6..9f84c61 100644
--- a/libdisplayconfig/Android.mk
+++ b/libdisplayconfig/Android.mk
@@ -4,10 +4,9 @@
 LOCAL_MODULE                  := libdisplayconfig
 LOCAL_MODULE_TAGS             := optional
 LOCAL_HEADER_LIBRARIES        := display_headers
-LOCAL_COPY_HEADERS            := DisplayConfig.h
 LOCAL_SRC_FILES               := DisplayConfig.cpp
 LOCAL_SHARED_LIBRARIES        := libhidlbase libhidltransport libutils \
-                                 vendor.display.config@1.0 android.hidl.base@1.0
+                                 vendor.display.config@1.0
 
 ifeq ($(LLVM_SA), true)
     LOCAL_CFLAGS += --compile-and-analyze --analyzer-perf --analyzer-Werror

sdm/libs/hwc2/Android.mk

diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
index 29480f0..52668c7 100644
--- a/sdm/libs/hwc2/Android.mk
+++ b/sdm/libs/hwc2/Android.mk
@@ -19,12 +19,12 @@
 LOCAL_SHARED_LIBRARIES        := libsdmcore libqservice libbinder libhardware libhardware_legacy \
                                  libutils libcutils libsync libqdutils libqdMetaData \
                                  libsdmutils libc++ liblog libgrallocutils libui libgpu_tonemapper \
-                                 libhidlbase libhidltransport vendor.display.config@1.0_vendor \
+                                 libhidlbase libhidltransport vendor.display.config@1.0 \
                                  android.hardware.graphics.mapper@2.0\
                                  android.hardware.graphics.allocator@2.0
 
 ifeq ($(display_config_version), DISPLAY_CONFIG_1_1)
-LOCAL_SHARED_LIBRARIES        += vendor.display.config@1.1_vendor
+LOCAL_SHARED_LIBRARIES        += vendor.display.config@1.1
 endif
 
 LOCAL_SRC_FILES               := hwc_session.cpp \