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

resolve merge conflicts of e89bf25 to stage-aosp-master

Browse Source 
am: 69c117c2ff

Change-Id: I668395a8f8ec5d004755ed39f8b7517be1e3527d
This commit is contained in:
Tao Bao
2016-10-18 23:00:55 +00:00
committed by android-build-merger
parent 434697f06b 69c117c2ff
commit 2a576e2097
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uncrypt/Android.mk
+6 -5
View File
@@ -20,11 +20,12 @@ LOCAL_CLANG := true
LOCAL_SRC_FILES := uncrypt.cpp LOCAL_SRC_FILES := uncrypt.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
LOCAL_MODULE := uncrypt LOCAL_MODULE := uncrypt
LOCAL_STATIC_LIBRARIES := libbootloader_message \ LOCAL_STATIC_LIBRARIES := \
libbase \ libbootloader_message \
liblog \ libbase \
libfs_mgr \ liblog \
libcutils libfs_mgr \
libcutils
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror
LOCAL_INIT_RC := uncrypt.rc LOCAL_INIT_RC := uncrypt.rc