diff options
| author | Mathias Agopian <mathias@google.com> | 2017-05-10 15:22:25 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2017-05-10 15:22:25 -0700 |
| commit | 8e97af1f13ecb2c76cdbce2bb6e4bf36f7e8a905 (patch) | |
| tree | 22b2864acc2c281e8fd058fa6330f93095243217 /merrifield/platforms/merrifield_plus/Android.mk | |
| parent | b01cc9ce33f8ddc08e099aa70ad66ef177288c1d (diff) | |
| download | hwcomposer-8e97af1f13ecb2c76cdbce2bb6e4bf36f7e8a905.tar.gz | |
fix circular dependency libnativewindow <-> libuioreo-mr1-devoreo-dr1-dev
Bug: 37647680
Bug: 37648355
Test: compile, manual
Change-Id: I7e5f416f25852b59531dad929e93881533ddf5d8
Diffstat (limited to 'merrifield/platforms/merrifield_plus/Android.mk')
| -rw-r--r-- | merrifield/platforms/merrifield_plus/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/merrifield/platforms/merrifield_plus/Android.mk b/merrifield/platforms/merrifield_plus/Android.mk index daa36b0..a0c9893 100644 --- a/merrifield/platforms/merrifield_plus/Android.mk +++ b/merrifield/platforms/merrifield_plus/Android.mk @@ -21,9 +21,11 @@ include $(CLEAR_VARS) LOCAL_PRELINK_MODULE := false LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \ - libwsbm libutils libhardware libnativewindow \ + libwsbm libutils libhardware \ libva libva-tpi libva-android libsync +LOCAL_HEADER_LIBRARIES := libsystem_headers + LOCAL_SRC_FILES := \ ../../common/base/Drm.cpp \ ../../common/base/HwcLayer.cpp \ |