diff options
author | Colin Cross <ccross@android.com> | 2019-03-29 10:27:23 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2019-03-29 10:27:23 -0700 |
commit | 2f49f81c06000a6e514860d7f94b37ea49c20a3b (patch) | |
tree | 73261c611fa5ffbb9b4ed0db8878606e12ae7058 | |
parent | 02f1096918113a3ac16b3768aa0bfd24900c01d6 (diff) | |
download | drm_hwcomposer-2f49f81c06000a6e514860d7f94b37ea49c20a3b.tar.gz |
Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5
Prevent external/drm_hwcomposer from referencing device/linaro/hikey,
which may not exist in all trees, by compiling most of drm_hwcomposer
as a static library and then compiling just the source files that
are affected by device-specific #defines and #includes in
device/linary/hikey/gralloc*.
Fixes: 129543119
Test: m hwcomposer.drm_hikey hwcomposer.drm_hikey960 MODULES-IN-external-drm_hwcomposer
Change-Id: I800b147a40c4e368ce1a74273728f5941f6b63c4
-rw-r--r-- | Android.bp | 62 |
1 files changed, 31 insertions, 31 deletions
@@ -47,6 +47,22 @@ cc_defaults { static_libs: ["libdrmhwc_utils"], + cflags: [ + "-Wall", + "-Werror", + ], + + cppflags: [ + "-DHWC2_USE_CPP11", + "-DHWC2_INCLUDE_STRINGIFICATION", + ], + + relative_install_path: "hw", + vendor: true, +} +cc_library_static { + name: "drm_hwcomposer", + defaults: ["hwcomposer.drm_defaults"], srcs: [ "autolock.cpp", "resourcemanager.cpp", @@ -63,50 +79,34 @@ cc_defaults { "drmproperty.cpp", "hwcutils.cpp", "platform.cpp", - "platformdrmgeneric.cpp", "vsyncworker.cpp", ], - cflags: [ - "-Wall", - "-Werror", - ], - - cppflags: [ - "-DHWC2_USE_CPP11", - "-DHWC2_INCLUDE_STRINGIFICATION", - ], - - relative_install_path: "hw", - vendor: true, } cc_library_shared { name: "hwcomposer.drm", defaults: ["hwcomposer.drm_defaults"], + whole_static_libs: ["drm_hwcomposer"], + srcs: ["platformdrmgeneric.cpp"], cppflags: ["-DUSE_DRM_GENERIC_IMPORTER"], } cc_library_shared { - name: "hwcomposer.drm_hikey", - defaults: ["hwcomposer.drm_defaults"], - cppflags: ["-DUSE_HISI_IMPORTER"], - srcs: ["platformhisi.cpp"], - include_dirs: ["device/linaro/hikey/gralloc"], -} - -cc_library_shared { - name: "hwcomposer.drm_hikey960", - defaults: ["hwcomposer.drm_defaults"], - cppflags: ["-DUSE_HISI_IMPORTER"], - srcs: ["platformhisi.cpp"], - include_dirs: ["device/linaro/hikey/gralloc960"], -} - - -cc_library_shared { name: "hwcomposer.drm_minigbm", defaults: ["hwcomposer.drm_defaults"], - srcs: ["platformminigbm.cpp"], + whole_static_libs: ["drm_hwcomposer"], + srcs: [ + "platformdrmgeneric.cpp", + "platformminigbm.cpp", + ], include_dirs: ["external/minigbm/cros_gralloc"], } +// Used by hwcomposer.drm_hikey and hwcomposer.drm_hikey960 +filegroup { + name: "drm_hwcomposer_platformhisi", + srcs: [ + "platformdrmgeneric.cpp", + "platformhisi.cpp", + ], +} |