diff options
author | Colin Cross <ccross@android.com> | 2019-03-29 10:29:39 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2019-03-29 10:29:39 -0700 |
commit | b5fc0cb2f36be563bb69959d7e181a5552c02385 (patch) | |
tree | b0d58d79f72c8c4174cc833b5edbd687ba05e2ce | |
parent | 5ba6c593c03624f682024d1b08108254f2b7d8e4 (diff) | |
download | hikey-b5fc0cb2f36be563bb69959d7e181a5552c02385.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: Idaac809ba271b27998f89c877ede46def9a417a4
-rw-r--r-- | gralloc/Android.bp | 6 | ||||
-rw-r--r-- | gralloc960/Android.bp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gralloc/Android.bp b/gralloc/Android.bp new file mode 100644 index 00000000..a198df52 --- /dev/null +++ b/gralloc/Android.bp @@ -0,0 +1,6 @@ +cc_library_shared { + name: "hwcomposer.drm_hikey", + defaults: ["hwcomposer.drm_defaults"], + srcs: [":drm_hwcomposer_platformhisi"], + whole_static_libs: ["drm_hwcomposer"], +} diff --git a/gralloc960/Android.bp b/gralloc960/Android.bp new file mode 100644 index 00000000..37d60a16 --- /dev/null +++ b/gralloc960/Android.bp @@ -0,0 +1,6 @@ +cc_library_shared { + name: "hwcomposer.drm_hikey960", + defaults: ["hwcomposer.drm_defaults"], + srcs: [":drm_hwcomposer_platformhisi"], + whole_static_libs: ["drm_hwcomposer"], +} |