[bootable/recovery] rkupdate compatible with 64 bit

bootable/recovery/Android.mk

@@ -57,7 +57,7 @@ LOCAL_CFLAGS += -D_FILE_OFFSET_BITS=64
 
 LOCAL_C_INCLUDES := \
 	$(prebuilt_stdcxx_PATH)/gnu-libstdc++/include\
-	$(prebuilt_stdcxx_PATH)/gnu-libstdc++/libs/$(TARGET_CPU_ABI)/include\
+	$(prebuilt_stdcxx_PATH)/gnu-libstdc++/libs/armeabi-v7a/include\
 	bionic \
 	bionic/libstdc++/include \
 	$(LOCAL_PATH)/rkupdate

bootable/recovery/rkupdate/rsa/Android.mk

@@ -1,6 +1,10 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-	
-LOCAL_PREBUILT_LIBS :=librkrsa.a
+
+ifeq ($(TARGET_ARCH), arm64)
+LOCAL_PREBUILT_LIBS := lib64/librkrsa.a
+else ifeq ($(TARGET_ARCH), arm)
+LOCAL_PREBUILT_LIBS := lib/librkrsa.a
+endif
 
 include $(BUILD_MULTI_PREBUILT)

bootable/recovery/rkupdate/stl/Android.mk

@@ -1,6 +1,10 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-	
-LOCAL_PREBUILT_LIBS := libgnustl_static.a
+
+ifeq ($(TARGET_ARCH), arm64)
+	LOCAL_PREBUILT_LIBS := lib64/libgnustl_static.a
+else ifeq ($(TARGET_ARCH), arm)
+	LOCAL_PREBUILT_LIBS := lib/libgnustl_static.a
+endif
 
 include $(BUILD_MULTI_PREBUILT)

bootable/recovery/rkupdate/update/Android.mk

@@ -1,6 +1,10 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-	
-LOCAL_PREBUILT_LIBS :=librkupdate.a
+
+ifeq ($(TARGET_ARCH), arm64)
+	LOCAL_PREBUILT_LIBS := lib64/librkupdate.a
+else ifeq ($(TARGET_ARCH), arm)
+	LOCAL_PREBUILT_LIBS := lib/librkupdate.a
+endif
 
 include $(BUILD_MULTI_PREBUILT)

bootable/recovery/rkupdate/uuid/Android.mk

@@ -1,6 +1,10 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-	
-LOCAL_PREBUILT_LIBS :=libext2_uuid.a
+
+ifeq ($(TARGET_ARCH), arm64)
+	LOCAL_PREBUILT_LIBS := lib64/libext2_uuid.a
+else ifeq ($(TARGET_ARCH), arm)
+	LOCAL_PREBUILT_LIBS := lib/libext2_uuid.a
+endif
 
 include $(BUILD_MULTI_PREBUILT)