diff options
| author | Tao Bao <tbao@google.com> | 2016-10-18 23:08:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-18 23:08:05 +0000 |
| commit | e2a706824e8c3ffc308c3ae2cd59c95906df76c1 (patch) | |
| tree | e80493fadfbea81163acad933e8c82620235d8fb /uncrypt | |
| parent | 81e54eddd4132895d70ab8b2307c693311799e05 (diff) | |
| parent | 2a576e20975b9a12610d19c3d782045b7fa227b8 (diff) | |
resolve merge conflicts of e89bf25 to stage-aosp-master am: 69c117c2ff
am: 2a576e2097
Change-Id: Iee6000f594a04a0862b3687f1d87daa809fb3804
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 |