diff options
| author | Tao Bao <tbao@google.com> | 2016-03-04 21:16:49 +0100 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-04 21:16:50 +0100 |
| commit | f639490a51655a4d372663e2f7000666748d7fda (patch) | |
| tree | 809e8d32b37becc3df2b6b1f101b6480c8be9fc8 /otafault | |
| parent | Merge "Restore labels on /postinstall during recovery." (diff) | |
| parent | Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES. (diff) | |
| download | android_bootable_recovery-f639490a51655a4d372663e2f7000666748d7fda.tar android_bootable_recovery-f639490a51655a4d372663e2f7000666748d7fda.tar.gz android_bootable_recovery-f639490a51655a4d372663e2f7000666748d7fda.tar.bz2 android_bootable_recovery-f639490a51655a4d372663e2f7000666748d7fda.tar.lz android_bootable_recovery-f639490a51655a4d372663e2f7000666748d7fda.tar.xz android_bootable_recovery-f639490a51655a4d372663e2f7000666748d7fda.tar.zst android_bootable_recovery-f639490a51655a4d372663e2f7000666748d7fda.zip | |
Diffstat (limited to 'otafault')
| -rw-r--r-- | otafault/Android.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/otafault/Android.mk b/otafault/Android.mk index 7468de6c4..52d706722 100644 --- a/otafault/Android.mk +++ b/otafault/Android.mk @@ -14,29 +14,34 @@ LOCAL_PATH := $(call my-dir) +# otafault (static library) +# =============================== include $(CLEAR_VARS) otafault_static_libs := \ libminzip \ - libz \ libselinux \ + libz LOCAL_SRC_FILES := config.cpp ota_io.cpp -LOCAL_MODULE_TAGS := eng LOCAL_MODULE := libotafault LOCAL_CLANG := true LOCAL_C_INCLUDES := bootable/recovery LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_WHOLE_STATIC_LIBRARIES := $(otafault_static_libs) +LOCAL_STATIC_LIBRARIES := $(otafault_static_libs) include $(BUILD_STATIC_LIBRARY) +# otafault_test (static executable) +# =============================== include $(CLEAR_VARS) LOCAL_SRC_FILES := config.cpp ota_io.cpp test.cpp LOCAL_MODULE_TAGS := tests LOCAL_MODULE := otafault_test -LOCAL_STATIC_LIBRARIES := $(otafault_static_libs) +LOCAL_STATIC_LIBRARIES := \ + libotafault \ + $(otafault_static_libs) LOCAL_C_INCLUDES := bootable/recovery LOCAL_FORCE_STATIC_EXECUTABLE := true |