diff options
author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-04-03 21:25:23 +0200 |
---|---|---|
committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-04-03 21:25:23 +0200 |
commit | 2a8b3a06026758f08062c68041a6fe194e982aa9 (patch) | |
tree | bc044cf8098a8cd0fa43f07dd65925035c75e731 /recovery/Android.mk | |
parent | 7c2f80683a3c22a26be6e9ccc535cf6045b380da (diff) | |
parent | e9df5ccf43ebac547647921965968781ef3980b4 (diff) | |
download | device_samsung_tuna-2a8b3a06026758f08062c68041a6fe194e982aa9.zip device_samsung_tuna-2a8b3a06026758f08062c68041a6fe194e982aa9.tar.gz device_samsung_tuna-2a8b3a06026758f08062c68041a6fe194e982aa9.tar.bz2 |
Merge remote branch 'remotes/google/master' into HEAD
Conflicts:
kernel
Diffstat (limited to 'recovery/Android.mk')
-rw-r--r-- | recovery/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recovery/Android.mk b/recovery/Android.mk index 585db84..2fc8313 100644 --- a/recovery/Android.mk +++ b/recovery/Android.mk @@ -1,4 +1,4 @@ -ifneq (,$(findstring $(TARGET_DEVICE),tuna toro maguro)) +ifneq (,$(findstring $(TARGET_DEVICE),tuna toro torospr maguro)) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -17,7 +17,7 @@ include $(CLEAR_VARS) # Edify extension functions for doing bootloader updates on Tuna devices. LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES += bootable/recovery +LOCAL_C_INCLUDES += bootable/recovery system/vold LOCAL_SRC_FILES := recovery_updater.c bootloader.c # should match TARGET_RECOVERY_UPDATER_LIBS set in BoardConfig.mk |