diff options
| author | Tao Bao <tbao@google.com> | 2018-05-22 01:21:09 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-22 01:21:09 +0200 |
| commit | dd88112054efe423d153ad4980e6657fcab41347 (patch) | |
| tree | 7d9f89072cfda17e1099a0f5e13198d0c8213949 | |
| parent | Merge "updater_config: make utils/PayloadSpecs non-static" (diff) | |
| parent | Merge "Move stuff from recovery into librecovery." (diff) | |
| download | android_bootable_recovery-dd88112054efe423d153ad4980e6657fcab41347.tar android_bootable_recovery-dd88112054efe423d153ad4980e6657fcab41347.tar.gz android_bootable_recovery-dd88112054efe423d153ad4980e6657fcab41347.tar.bz2 android_bootable_recovery-dd88112054efe423d153ad4980e6657fcab41347.tar.lz android_bootable_recovery-dd88112054efe423d153ad4980e6657fcab41347.tar.xz android_bootable_recovery-dd88112054efe423d153ad4980e6657fcab41347.tar.zst android_bootable_recovery-dd88112054efe423d153ad4980e6657fcab41347.zip | |
| -rw-r--r-- | Android.mk | 81 | ||||
| -rw-r--r-- | tests/Android.mk | 2 |
2 files changed, 40 insertions, 43 deletions
diff --git a/Android.mk b/Android.mk index 214d028da..fef5846ac 100644 --- a/Android.mk +++ b/Android.mk @@ -97,12 +97,48 @@ endif include $(BUILD_STATIC_LIBRARY) +librecovery_static_libraries := \ + $(TARGET_RECOVERY_UI_LIB) \ + libbootloader_message \ + libfusesideload \ + libminadbd \ + librecovery_ui \ + libminui \ + libverifier \ + libotautil \ + libasyncio \ + libbatterymonitor \ + libcrypto_utils \ + libcrypto \ + libext4_utils \ + libfs_mgr \ + libpng \ + libsparse \ + libvintf_recovery \ + libvintf \ + libhidl-gen-utils \ + libtinyxml2 \ + libziparchive \ + libbase \ + libutils \ + libcutils \ + liblog \ + libselinux \ + libz \ + # librecovery (static library) # =============================== include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - install.cpp + adb_install.cpp \ + fuse_sdcard_provider.cpp \ + install.cpp \ + recovery.cpp \ + roots.cpp \ + +LOCAL_C_INCLUDES := \ + system/vold \ LOCAL_CFLAGS := $(recovery_common_cflags) @@ -113,13 +149,7 @@ endif LOCAL_MODULE := librecovery LOCAL_STATIC_LIBRARIES := \ - libminui \ - libotautil \ - libvintf_recovery \ - libcrypto_utils \ - libcrypto \ - libbase \ - libziparchive \ + $(librecovery_static_libraries) include $(BUILD_STATIC_LIBRARY) @@ -128,12 +158,8 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - adb_install.cpp \ - fuse_sdcard_provider.cpp \ logging.cpp \ - recovery.cpp \ recovery_main.cpp \ - roots.cpp \ LOCAL_MODULE := recovery @@ -147,38 +173,9 @@ LOCAL_USE_CLANG_LLD := false LOCAL_CFLAGS := $(recovery_common_cflags) -LOCAL_C_INCLUDES += \ - system/vold \ - LOCAL_STATIC_LIBRARIES := \ librecovery \ - $(TARGET_RECOVERY_UI_LIB) \ - libbootloader_message \ - libfusesideload \ - libminadbd \ - librecovery_ui \ - libminui \ - libverifier \ - libotautil \ - libasyncio \ - libbatterymonitor \ - libcrypto_utils \ - libcrypto \ - libext4_utils \ - libfs_mgr \ - libpng \ - libsparse \ - libvintf_recovery \ - libvintf \ - libhidl-gen-utils \ - libtinyxml2 \ - libziparchive \ - libbase \ - libcutils \ - libutils \ - liblog \ - libselinux \ - libz \ + $(librecovery_static_libraries) LOCAL_HAL_STATIC_LIBRARIES := libhealthd diff --git a/tests/Android.mk b/tests/Android.mk index cdc5b523a..853ca273b 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -174,8 +174,8 @@ librecovery_static_libraries := \ libtinyxml2 \ libziparchive \ libbase \ - libcutils \ libutils \ + libcutils \ liblog \ libselinux \ libz \ |