PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 6fba98c to stage-aosp-master

Browse Source 
Change-Id: I2fa8b85109309ec88c1f8d8def593aa65ab885d7
This commit is contained in:
Tianjie Xu
2016-10-18 14:13:07 -07:00
parent 430b7ae469 6fba98ce64
commit 8176cf232e
34 changed files with 475 additions and 2344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
+3 -2
View File
@@ -77,7 +77,8 @@ LOCAL_STATIC_LIBRARIES := \
libbootloader_message \
libext4_utils_static \
libsparse_static \
libminzip \
libziparchive \
libotautil \
libmounts \
libz \
libminadbd \
@@ -155,8 +156,8 @@ include \
$(LOCAL_PATH)/edify/Android.mk \
$(LOCAL_PATH)/minadbd/Android.mk \
$(LOCAL_PATH)/minui/Android.mk \
$(LOCAL_PATH)/minzip/Android.mk \
$(LOCAL_PATH)/otafault/Android.mk \
$(LOCAL_PATH)/otautil/Android.mk \
$(LOCAL_PATH)/tests/Android.mk \
$(LOCAL_PATH)/tools/Android.mk \
$(LOCAL_PATH)/uncrypt/Android.mk \