From d6695d5bdc83be03d775a91d961dfa5c89543ac1 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 15 Dec 2017 14:38:33 -0800 Subject: [PATCH] graphics: move libgralloc1-adapter Move libgralloc1-adapter from 2.0/default/ to 2.0/utils/gralloc1-adapter/. Fix build issues after the move. Test: builds Change-Id: I674fe60c724a4ffc1540c796b92209a1dbf36438 --- graphics/allocator/2.0/default/Android.bp | 10 ---------- graphics/allocator/2.0/utils/OWNERS | 4 ++++ .../allocator/2.0/utils/gralloc1-adapter/Android.bp | 10 ++++++++++ .../gralloc1-adapter}/Gralloc1On0Adapter.cpp | 1 + .../gralloc1-adapter}/Gralloc1On0Adapter.h | 0 .../gralloc1-adapter}/gralloc1-adapter.cpp | 0 .../gralloc1-adapter}/gralloc1-adapter.h | 0 7 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 graphics/allocator/2.0/utils/OWNERS create mode 100644 graphics/allocator/2.0/utils/gralloc1-adapter/Android.bp rename graphics/allocator/2.0/{default => utils/gralloc1-adapter}/Gralloc1On0Adapter.cpp (99%) rename graphics/allocator/2.0/{default => utils/gralloc1-adapter}/Gralloc1On0Adapter.h (100%) rename graphics/allocator/2.0/{default => utils/gralloc1-adapter}/gralloc1-adapter.cpp (100%) rename graphics/allocator/2.0/{default => utils/gralloc1-adapter}/gralloc1-adapter.h (100%) diff --git a/graphics/allocator/2.0/default/Android.bp b/graphics/allocator/2.0/default/Android.bp index 9968f41f9a..7964032548 100644 --- a/graphics/allocator/2.0/default/Android.bp +++ b/graphics/allocator/2.0/default/Android.bp @@ -36,13 +36,3 @@ cc_binary { "libutils", ], } - -cc_library_static { - name: "libgralloc1-adapter", - defaults: ["hidl_defaults"], - srcs: ["gralloc1-adapter.cpp", "Gralloc1On0Adapter.cpp"], - include_dirs: ["system/core/libsync/include"], - cflags: ["-Wall", "-Wextra"], - export_include_dirs: ["."], - whole_static_libs: ["libgrallocusage"], -} diff --git a/graphics/allocator/2.0/utils/OWNERS b/graphics/allocator/2.0/utils/OWNERS new file mode 100644 index 0000000000..3aa5fa1ffd --- /dev/null +++ b/graphics/allocator/2.0/utils/OWNERS @@ -0,0 +1,4 @@ +# Graphics team +jessehall@google.com +olv@google.com +stoza@google.com diff --git a/graphics/allocator/2.0/utils/gralloc1-adapter/Android.bp b/graphics/allocator/2.0/utils/gralloc1-adapter/Android.bp new file mode 100644 index 0000000000..9cb53e363b --- /dev/null +++ b/graphics/allocator/2.0/utils/gralloc1-adapter/Android.bp @@ -0,0 +1,10 @@ +cc_library_static { + name: "libgralloc1-adapter", + defaults: ["hidl_defaults"], + vendor: true, + srcs: ["gralloc1-adapter.cpp", "Gralloc1On0Adapter.cpp"], + include_dirs: ["system/core/libsync/include"], + export_include_dirs: ["."], + whole_static_libs: ["libgrallocusage"], + shared_libs: ["libhardware", "liblog"], +} diff --git a/graphics/allocator/2.0/default/Gralloc1On0Adapter.cpp b/graphics/allocator/2.0/utils/gralloc1-adapter/Gralloc1On0Adapter.cpp similarity index 99% rename from graphics/allocator/2.0/default/Gralloc1On0Adapter.cpp rename to graphics/allocator/2.0/utils/gralloc1-adapter/Gralloc1On0Adapter.cpp index 041ce777da..b7ed58ceb3 100644 --- a/graphics/allocator/2.0/default/Gralloc1On0Adapter.cpp +++ b/graphics/allocator/2.0/utils/gralloc1-adapter/Gralloc1On0Adapter.cpp @@ -29,6 +29,7 @@ #include #include +#include template static gralloc1_function_pointer_t asFP(T function) diff --git a/graphics/allocator/2.0/default/Gralloc1On0Adapter.h b/graphics/allocator/2.0/utils/gralloc1-adapter/Gralloc1On0Adapter.h similarity index 100% rename from graphics/allocator/2.0/default/Gralloc1On0Adapter.h rename to graphics/allocator/2.0/utils/gralloc1-adapter/Gralloc1On0Adapter.h diff --git a/graphics/allocator/2.0/default/gralloc1-adapter.cpp b/graphics/allocator/2.0/utils/gralloc1-adapter/gralloc1-adapter.cpp similarity index 100% rename from graphics/allocator/2.0/default/gralloc1-adapter.cpp rename to graphics/allocator/2.0/utils/gralloc1-adapter/gralloc1-adapter.cpp diff --git a/graphics/allocator/2.0/default/gralloc1-adapter.h b/graphics/allocator/2.0/utils/gralloc1-adapter/gralloc1-adapter.h similarity index 100% rename from graphics/allocator/2.0/default/gralloc1-adapter.h rename to graphics/allocator/2.0/utils/gralloc1-adapter/gralloc1-adapter.h