commit 147209468d45cec134fc2332d74d71f0d0cd00e7
author Brian C. Young <bcyoung@google.com> Tue Apr 11 19:06:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 11 19:06:21 2017 +0000
tree 204c7419c4edbb437a4815e8259ed226a80611a8
parent 74e272b83f3fea86fd27cf98640fa90d2945fb99
parent 8fbe1f6c2a4a6ef96f6ff02d697279e32ae98141

Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into lmp-dev am: fc9d732ca6 am: 591a49b3a2 am: ee89cfbe7f am: e02fe54175 am: 558539ff17 am: d8d9b6d874 am: 2c75b48f97 am: 3aa8146eae am: 9d3aaf2517 am: 86a7020b90 am: f16b348b93
am: 8fbe1f6c2a

Change-Id: Ief6a14a3355bbbec01e8044289f4aad083a21e10

Android.mk

diff --git a/Android.mk b/Android.mk
index f35448f..c1ae8bb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -87,7 +87,7 @@
 LOCAL_SRC_FILES := $(common_SRC_FILES)
 LOCAL_C_INCLUDES += $(common_C_INCLUDES)
 LOCAL_CFLAGS += $(common_CFLAGS) -fvisibility=hidden
-LOCAL_SHARED_LIBRARIES += libicuuc-host
+LOCAL_SHARED_LIBRARIES += libicuuc
 LOCAL_MODULE := libxml2
 LOCAL_CLANG := true
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk

timsort.h

diff --git a/timsort.h b/timsort.h
index 795f272..443918a 100644
--- a/timsort.h
+++ b/timsort.h
@@ -323,7 +323,7 @@
     SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
     if (tempstore == NULL)
     {
-      fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
+      fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
       exit(1);
     }
     store->storage = tempstore;