diff options
| author | Sean Paul <seanpaul@chromium.org> | 2016-04-22 09:11:09 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2016-05-16 18:22:28 -0400 |
| commit | 5b978756df6c94e0d263063a569716b099367171 (patch) | |
| tree | 19131d775f4481b3af678de52007880c6f18b7b8 | |
| parent | e65d1be1f8d8f770ccb44ec119514cc6df8d89bc (diff) | |
| download | drm_hwcomposer-5b978756df6c94e0d263063a569716b099367171.tar.gz | |
DO NOT MERGE: drm_hwcomposer: Move drmgeneric and nv importer cpp files
Final step in the platform renaming, move the drmgeneric and
nvimporter files to their new place.
BUG=b/28117135
TEST=compiles
Change-Id: Ied60a82526f42f13a64192373cb49f3dfffef74f
Signed-off-by: Sean Paul <seanpaul@chromium.org>
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | platformdrmgeneric.cpp (renamed from drmgenericimporter.cpp) | 0 | ||||
| -rw-r--r-- | platformnv.cpp (renamed from nvimporter.cpp) | 0 |
3 files changed, 2 insertions, 2 deletions
@@ -59,11 +59,11 @@ LOCAL_SRC_FILES := \ worker.cpp ifeq ($(strip $(BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER)),nvidia-gralloc) -LOCAL_SRC_FILES += nvimporter.cpp +LOCAL_SRC_FILES += platformnv.cpp LOCAL_CPPFLAGS += -DUSE_NVIDIA_IMPORTER else LOCAL_C_INCLUDES += external/drm_gralloc -LOCAL_SRC_FILES += drmgenericimporter.cpp +LOCAL_SRC_FILES += platformdrmgeneric.cpp LOCAL_CPPFLAGS += -DUSE_DRM_GENERIC_IMPORTER endif diff --git a/drmgenericimporter.cpp b/platformdrmgeneric.cpp index ad2b52b..ad2b52b 100644 --- a/drmgenericimporter.cpp +++ b/platformdrmgeneric.cpp diff --git a/nvimporter.cpp b/platformnv.cpp index 0ec455a..0ec455a 100644 --- a/nvimporter.cpp +++ b/platformnv.cpp |