diff options
| author | Tao Bao <tbao@google.com> | 2016-10-18 15:08:07 -0700 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2016-10-18 15:08:07 -0700 |
| commit | 69c117c2ffb71cdbfde71c65d510014e162a1016 (patch) | |
| tree | 0f7256d10e63bb682c79d3a1ff123a092ab06a38 /uncrypt | |
| parent | 8176cf232e9f613a2e500f09461fc3f448267d07 (diff) | |
| parent | e89bf257a1e8304194b426467bb923eb34967396 (diff) | |
resolve merge conflicts of e89bf25 to stage-aosp-master
Change-Id: I3b0ddb23daf264d407370cd8ace31eceb230a11a
Diffstat (limited to 'uncrypt')
| -rw-r--r-- | uncrypt/Android.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/uncrypt/Android.mk b/uncrypt/Android.mk index 97fc7089..59084b0b 100644 --- a/uncrypt/Android.mk +++ b/uncrypt/Android.mk @@ -20,11 +20,12 @@ LOCAL_CLANG := true LOCAL_SRC_FILES := uncrypt.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. LOCAL_MODULE := uncrypt -LOCAL_STATIC_LIBRARIES := libbootloader_message \ - libbase \ - liblog \ - libfs_mgr \ - libcutils +LOCAL_STATIC_LIBRARIES := \ + libbootloader_message \ + libbase \ + liblog \ + libfs_mgr \ + libcutils LOCAL_CFLAGS := -Werror LOCAL_INIT_RC := uncrypt.rc |