diff options
| author | John Stultz <john.stultz@linaro.org> | 2021-02-25 23:51:26 +0000 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2021-04-27 21:11:04 +0000 |
| commit | 893f7f144a35df5058d28559afa5df11309e752b (patch) | |
| tree | 918f0443c7d70163f2704e221328a315319c19b2 /cros_gralloc | |
| parent | c4218c61b5b7a099addf6b58d2ef12f897ba2730 (diff) | |
| download | minigbm-893f7f144a35df5058d28559afa5df11309e752b.tar.gz | |
minigbm: Andorid.bp: Use cc_defaults in defining libminigbm_cros_gralloc and users
This splits out some cc_defaults for libminigbm_cros_gralloc and
users of that library. This is needed because the underlying
minigbm_defaults needs to be built with different cflags for
different hardware, so this change allows us to share the
default build values.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I2111c325d4a206b8889a9314a5204b34a38a1ee1
Diffstat (limited to 'cros_gralloc')
| -rw-r--r-- | cros_gralloc/gralloc4/Android.bp | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/cros_gralloc/gralloc4/Android.bp b/cros_gralloc/gralloc4/Android.bp index bbe70e1..c8b01b1 100644 --- a/cros_gralloc/gralloc4/Android.bp +++ b/cros_gralloc/gralloc4/Android.bp @@ -23,11 +23,10 @@ package { default_applicable_licenses: ["external_minigbm_license"], } -cc_binary { - name: "android.hardware.graphics.allocator@4.0-service.minigbm", +cc_defaults { + name: "service_minigbm_defaults", relative_install_path: "hw", vendor: true, - init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm.rc"], vintf_fragments: ["android.hardware.graphics.allocator@4.0.xml"], @@ -50,7 +49,6 @@ cc_binary { static_libs: [ "libdrm", - "libminigbm_cros_gralloc", ], srcs: [ @@ -60,8 +58,17 @@ cc_binary { ], } -cc_library_shared { - name: "android.hardware.graphics.mapper@4.0-impl.minigbm", +cc_binary { + name: "android.hardware.graphics.allocator@4.0-service.minigbm", + init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm.rc"], + defaults: ["service_minigbm_defaults"], + static_libs: [ + "libminigbm_cros_gralloc", + ], +} + +cc_defaults { + name: "impl_minigbm_defaults", relative_install_path: "hw", vendor: true, @@ -85,7 +92,6 @@ cc_library_shared { static_libs: [ "libdrm", - "libminigbm_cros_gralloc", ], srcs: [ @@ -93,3 +99,13 @@ cc_library_shared { "CrosGralloc4Utils.cc", ], } + +cc_library_shared { + name: "android.hardware.graphics.mapper@4.0-impl.minigbm", + defaults: ["impl_minigbm_defaults"], + + static_libs: [ + "libminigbm_cros_gralloc", + ], + +} |