diff options
| author | TreeHugger Robot | 2017-11-13 14:40:38 -0600 |
|---|---|---|
| committer | Android (Google) Code Review | 2017-11-13 14:40:38 -0600 |
| commit | 91d263d6a9f6a48dbf66356c947b6f726d344719 (patch) | |
| tree | 822f70c396aabbe3ca2e799a3493b70b5986b7cf /configstore | |
| parent | 95eece8169926d07b7024a925ba74193710a9212 (diff) | |
| parent | b6fa3ae638451157866b765b2297f7a93fd6a769 (diff) | |
| download | platform-hardware-interfaces-91d263d6a9f6a48dbf66356c947b6f726d344719.tar.gz platform-hardware-interfaces-91d263d6a9f6a48dbf66356c947b6f726d344719.tar.xz platform-hardware-interfaces-91d263d6a9f6a48dbf66356c947b6f726d344719.zip | |
Merge "Fix library loading order in .mk files."
Diffstat (limited to 'configstore')
| -rw-r--r-- | configstore/1.1/default/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configstore/1.1/default/Android.mk b/configstore/1.1/default/Android.mk index 58b67c15..53e454b0 100644 --- a/configstore/1.1/default/Android.mk +++ b/configstore/1.1/default/Android.mk | |||
| @@ -13,14 +13,14 @@ LOCAL_SRC_FILES:= service.cpp | |||
| 13 | include $(LOCAL_PATH)/surfaceflinger.mk | 13 | include $(LOCAL_PATH)/surfaceflinger.mk |
| 14 | 14 | ||
| 15 | LOCAL_SHARED_LIBRARIES := \ | 15 | LOCAL_SHARED_LIBRARIES := \ |
| 16 | android.hardware.configstore@1.0 \ | ||
| 17 | android.hardware.configstore@1.1 \ | ||
| 18 | libhidlbase \ | 16 | libhidlbase \ |
| 19 | libhidltransport \ | 17 | libhidltransport \ |
| 20 | libbase \ | 18 | libbase \ |
| 21 | libhwminijail \ | 19 | libhwminijail \ |
| 22 | liblog \ | 20 | liblog \ |
| 23 | libutils \ | 21 | libutils \ |
| 22 | android.hardware.configstore@1.0 \ | ||
| 23 | android.hardware.configstore@1.1 | ||
| 24 | 24 | ||
| 25 | include $(BUILD_EXECUTABLE) | 25 | include $(BUILD_EXECUTABLE) |
| 26 | 26 | ||