Merge "Remove default libraries"

diff --git a/boot_control_copy/Android.mk b/boot_control_copy/Android.mk
index 3a5f8a0..fecd314 100644 (file)
--- a/boot_control_copy/Android.mk
+++ b/boot_control_copy/Android.mk
@@ -3,7 +3,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := boot_control_copy.c bootinfo.c
+LOCAL_SRC_FILES := boot_control_copy.cpp bootinfo.cpp
 LOCAL_CFLAGS := -Wall -Wno-missing-field-initializers -Wno-unused-parameter
 LOCAL_C_INCLUDES := system/core/mkbootimg bootable/recovery
 LOCAL_SHARED_LIBRARIES := libbase libcutils

diff --git a/boot_control_copy/boot_control_copy.c b/boot_control_copy/boot_control_copy.cpp
similarity index 100%
rename from boot_control_copy/boot_control_copy.c
rename to boot_control_copy/boot_control_copy.cpp

diff --git a/boot_control_copy/bootinfo.c b/boot_control_copy/bootinfo.cpp
similarity index 98%
rename from boot_control_copy/bootinfo.c
rename to boot_control_copy/bootinfo.cpp
index dbc0757..f21fe84 100644 (file)
--- a/boot_control_copy/bootinfo.c
+++ b/boot_control_copy/bootinfo.cpp
@@ -90,7 +90,7 @@ int boot_info_open_partition(const char *name, uint64_t *out_size, int flags)
     }
     trimmed_len = end_slash - record->blk_device + 1;
     name_len = strlen(name);
-    path = calloc(trimmed_len + name_len + 1, 1);
+    path = static_cast<char *>(calloc(trimmed_len + name_len + 1, 1));
     strncpy(path, record->blk_device, trimmed_len);
     strncpy(path + trimmed_len, name, name_len);
   }

diff --git a/slideshow/Android.mk b/slideshow/Android.mk
index bd66420..6da4416 100644 (file)
--- a/slideshow/Android.mk
+++ b/slideshow/Android.mk
@@ -11,5 +11,14 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
 LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
 
 LOCAL_CFLAGS := -D__STDC_LIMIT_MACROS -Werror
-LOCAL_STATIC_LIBRARIES := libminui libpng libz libutils libcutils liblog libm libc
+LOCAL_STATIC_LIBRARIES := \
+    libminui \
+    libpng \
+    libbase \
+    libz \
+    libutils \
+    libcutils \
+    liblog \
+    libm \
+    libc
 include $(BUILD_EXECUTABLE)