Evolution-x-devices/device_google_wahoo
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_wahoo synced 2026-01-28 13:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of e36307e to oc-mr1-dev-plus-aosp

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4beb46894278f581921662b80fcd9caee06d8052
This commit is contained in:
Jiyong Park
2017-09-01 14:26:09 +09:00
parent 54d177d0dd e36307e85a
commit fb8c03ae24
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
device.mk
View File

@@ -556,6 +556,7 @@ PRODUCT_PACKAGES += \
libcompiler_rt.vndk-sp\
libbacktrace.vndk-sp\
libunwind.vndk-sp\
libunwindstack.vndk-sp\
liblzma.vndk-sp\
libz.vndk-sp\

1
vndk/Android.mk
View File

@@ -15,6 +15,7 @@ VNDK_SP_LIBRARIES += \
libc++\
libbacktrace\
libunwind\
libunwindstack\
liblzma\
libhidlbase\
libhidltransport\