diff options
| author | Doug Zongker <dougz@android.com> | 2009-07-15 18:10:28 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@android.com> | 2009-07-15 18:10:28 -0700 |
| commit | 608fa02e1ac0ea11a0d3ca754f38bd76b77faa82 (patch) | |
| tree | 5e7eb02fce9e783a2a149b8580e3da69d3cb6a2d /Android.mk | |
| parent | c457ff643627fb3edf0321a37fcffd6b520f931e (diff) | |
| parent | 64893ccc09b25ac31bc6a17f5c7f43c7fa789576 (diff) | |
| download | bootable_recovery-608fa02e1ac0ea11a0d3ca754f38bd76b77faa82.zip bootable_recovery-608fa02e1ac0ea11a0d3ca754f38bd76b77faa82.tar.gz bootable_recovery-608fa02e1ac0ea11a0d3ca754f38bd76b77faa82.tar.bz2 | |
resolved conflicts for merge of 64893ccc to master
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -9,7 +9,6 @@ commands_recovery_local_path := $(LOCAL_PATH) LOCAL_SRC_FILES := \ recovery.c \ bootloader.c \ - commands.c \ firmware.c \ install.c \ roots.c \ @@ -38,14 +37,13 @@ ifeq ($(TARGET_RECOVERY_UI_LIB),) else LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB) endif -LOCAL_STATIC_LIBRARIES += libminzip libunz libamend libmtdutils libmincrypt +LOCAL_STATIC_LIBRARIES += libminzip libunz libmtdutils libmincrypt LOCAL_STATIC_LIBRARIES += libminui libpixelflinger_static libpng libcutils LOCAL_STATIC_LIBRARIES += libstdc++ libc include $(BUILD_EXECUTABLE) include $(commands_recovery_local_path)/minui/Android.mk -include $(commands_recovery_local_path)/amend/Android.mk include $(commands_recovery_local_path)/minzip/Android.mk include $(commands_recovery_local_path)/mtdutils/Android.mk include $(commands_recovery_local_path)/tools/Android.mk |