tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve merge conflicts of e89bf25 to stage-aosp-master

Browse source 
Change-Id: I3b0ddb23daf264d407370cd8ace31eceb230a11a
This commit is contained in:
Tao Bao 2016-10-18 15:08:07 -07:00
commit 69c117c2ff
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
uncrypt/Android.mk
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