diff options
| author | Krzysztof Kosiński <krzysio@google.com> | 2021-07-02 22:48:55 -0700 |
|---|---|---|
| committer | Krzysztof Kosiński <krzysio@google.com> | 2021-07-02 23:05:51 -0700 |
| commit | a67810d68d3d8fa25de6b38bb489af6fef6810a6 (patch) | |
| tree | 735de9cab423864e3a13d391c0a665f33dec8717 /libvendorgraphicbuffer | |
| parent | 27d4aa1db7cb69ef1b38a4cf61df57236d31ad5c (diff) | |
Remove build support for gralloc3.
All relevant devices use gralloc4 now, so this is dead code.
Bug: 174998182
Test: build for affected devices, camera preview
Change-Id: I95320a0c787128692728433443ffd5892ee08b65
Diffstat (limited to 'libvendorgraphicbuffer')
| -rw-r--r-- | libvendorgraphicbuffer/Android.bp | 58 |
1 files changed, 8 insertions, 50 deletions
diff --git a/libvendorgraphicbuffer/Android.bp b/libvendorgraphicbuffer/Android.bp index 8c1a71d..228d0c1 100644 --- a/libvendorgraphicbuffer/Android.bp +++ b/libvendorgraphicbuffer/Android.bp @@ -19,60 +19,14 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -soong_config_module_type { - name: "vendorgraphicbuffer_cc_defaults", - module_type: "cc_defaults", - config_namespace: "vendorgraphicbuffer", - variables: [ - "gralloc_version", - ], - properties: [ - "srcs", "include_dirs", "cflags", "shared_libs", - ], -} - -soong_config_string_variable { - name: "gralloc_version", - values: ["three", "four"], -} - -vendorgraphicbuffer_cc_defaults { - name: "vendorgraphicbuffer_defaults", - soong_config_variables: { - gralloc_version: { - three: { - include_dirs: [ - "hardware/google/gchips/gralloc3/src", - "hardware/google/gchips/include", - ], - srcs: [ - "gralloc3/vendor_graphicbuffer_mapper.cpp", - "gralloc3/vendor_graphicbuffer_meta.cpp", - ], - }, - four: { - include_dirs: [ - "hardware/google/gchips/gralloc4/src", - "hardware/google/gchips/include", - ], - srcs: [ - "gralloc4/vendor_graphicbuffer_mapper.cpp", - "gralloc4/vendor_graphicbuffer_meta.cpp", - ], - shared_libs: [ - "libdrm", - ], - }, - }, - }, -} - cc_library_shared { name: "libvendorgraphicbuffer", - defaults: [ - "vendorgraphicbuffer_defaults", + srcs: [ + "gralloc4/vendor_graphicbuffer_mapper.cpp", + "gralloc4/vendor_graphicbuffer_meta.cpp", ], shared_libs: [ + "libdrm", "libutils", "libui", "liblog", @@ -88,6 +42,10 @@ cc_library_shared { "libgralloctypes", "libhidlbase", ], + include_dirs: [ + "hardware/google/gchips/gralloc4/src", + "hardware/google/gchips/include", + ], export_include_dirs: [ "include", ], |