diff options
author | Chia-I Wu | 2017-12-15 16:38:33 -0600 |
---|---|---|
committer | Chia-I Wu | 2018-01-14 23:39:38 -0600 |
commit | d6695d5bdc83be03d775a91d961dfa5c89543ac1 (patch) | |
tree | 25e472935aa45f6981b568d9cb9b0c90a679e5e3 | |
parent | 1612a3c27e62626f47707953b542921d9b6d2830 (diff) | |
download | platform-hardware-interfaces-d6695d5bdc83be03d775a91d961dfa5c89543ac1.tar.gz platform-hardware-interfaces-d6695d5bdc83be03d775a91d961dfa5c89543ac1.tar.xz platform-hardware-interfaces-d6695d5bdc83be03d775a91d961dfa5c89543ac1.zip |
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
-rw-r--r-- | graphics/allocator/2.0/default/Android.bp | 10 | ||||
-rw-r--r-- | graphics/allocator/2.0/utils/OWNERS | 4 | ||||
-rw-r--r-- | graphics/allocator/2.0/utils/gralloc1-adapter/Android.bp | 10 | ||||
-rw-r--r-- | graphics/allocator/2.0/utils/gralloc1-adapter/Gralloc1On0Adapter.cpp (renamed from graphics/allocator/2.0/default/Gralloc1On0Adapter.cpp) | 1 | ||||
-rw-r--r-- | graphics/allocator/2.0/utils/gralloc1-adapter/Gralloc1On0Adapter.h (renamed from graphics/allocator/2.0/default/Gralloc1On0Adapter.h) | 0 | ||||
-rw-r--r-- | graphics/allocator/2.0/utils/gralloc1-adapter/gralloc1-adapter.cpp (renamed from graphics/allocator/2.0/default/gralloc1-adapter.cpp) | 0 | ||||
-rw-r--r-- | graphics/allocator/2.0/utils/gralloc1-adapter/gralloc1-adapter.h (renamed from graphics/allocator/2.0/default/gralloc1-adapter.h) | 0 |
7 files changed, 15 insertions, 10 deletions
diff --git a/graphics/allocator/2.0/default/Android.bp b/graphics/allocator/2.0/default/Android.bp index 9968f41f..79640325 100644 --- a/graphics/allocator/2.0/default/Android.bp +++ b/graphics/allocator/2.0/default/Android.bp | |||
@@ -36,13 +36,3 @@ cc_binary { | |||
36 | "libutils", | 36 | "libutils", |
37 | ], | 37 | ], |
38 | } | 38 | } |
39 | |||
40 | cc_library_static { | ||
41 | name: "libgralloc1-adapter", | ||
42 | defaults: ["hidl_defaults"], | ||
43 | srcs: ["gralloc1-adapter.cpp", "Gralloc1On0Adapter.cpp"], | ||
44 | include_dirs: ["system/core/libsync/include"], | ||
45 | cflags: ["-Wall", "-Wextra"], | ||
46 | export_include_dirs: ["."], | ||
47 | whole_static_libs: ["libgrallocusage"], | ||
48 | } | ||
diff --git a/graphics/allocator/2.0/utils/OWNERS b/graphics/allocator/2.0/utils/OWNERS new file mode 100644 index 00000000..3aa5fa1f --- /dev/null +++ b/graphics/allocator/2.0/utils/OWNERS | |||
@@ -0,0 +1,4 @@ | |||
1 | # Graphics team | ||
2 | jessehall@google.com | ||
3 | olv@google.com | ||
4 | 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 00000000..9cb53e36 --- /dev/null +++ b/graphics/allocator/2.0/utils/gralloc1-adapter/Android.bp | |||
@@ -0,0 +1,10 @@ | |||
1 | cc_library_static { | ||
2 | name: "libgralloc1-adapter", | ||
3 | defaults: ["hidl_defaults"], | ||
4 | vendor: true, | ||
5 | srcs: ["gralloc1-adapter.cpp", "Gralloc1On0Adapter.cpp"], | ||
6 | include_dirs: ["system/core/libsync/include"], | ||
7 | export_include_dirs: ["."], | ||
8 | whole_static_libs: ["libgrallocusage"], | ||
9 | shared_libs: ["libhardware", "liblog"], | ||
10 | } | ||
diff --git a/graphics/allocator/2.0/default/Gralloc1On0Adapter.cpp b/graphics/allocator/2.0/utils/gralloc1-adapter/Gralloc1On0Adapter.cpp index 041ce777..b7ed58ce 100644 --- a/graphics/allocator/2.0/default/Gralloc1On0Adapter.cpp +++ b/graphics/allocator/2.0/utils/gralloc1-adapter/Gralloc1On0Adapter.cpp | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <sync/sync.h> | 29 | #include <sync/sync.h> |
30 | 30 | ||
31 | #include <inttypes.h> | 31 | #include <inttypes.h> |
32 | #include <unistd.h> | ||
32 | 33 | ||
33 | template <typename PFN, typename T> | 34 | template <typename PFN, typename T> |
34 | static gralloc1_function_pointer_t asFP(T function) | 35 | 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 index 180015de..180015de 100644 --- a/graphics/allocator/2.0/default/Gralloc1On0Adapter.h +++ b/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 index fcc59cd1..fcc59cd1 100644 --- a/graphics/allocator/2.0/default/gralloc1-adapter.cpp +++ b/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 index b912ef65..b912ef65 100644 --- a/graphics/allocator/2.0/default/gralloc1-adapter.h +++ b/graphics/allocator/2.0/utils/gralloc1-adapter/gralloc1-adapter.h | |||