commit 66b6eb9490beeeabc804d790c1c4060ce047afd4
author Sergio Giro <sgiro@google.com> Tue Aug 18 17:36:50 2015 +0100
committer Sergio Giro <sgiro@google.com> Fri Aug 21 20:36:19 2015 +0100
tree e756347e953a51986db82262066245264f59c8a9
parent e0dce90b0de2b2b7c2baae8035f810a55526effb

[DO NOT MERGE] libutils: fix overflow in SharedBuffer

See
https://code.google.com/p/android/issues/detail?id=181910

Bug: 22952485
(cherry picked from commit 7987b83553804156aeca61b4c111c2b983c4c551)

Change-Id: I3cac87185f209dc79678ae702aa18afbdf4190df

libutils/Android.mk

diff --git a/libutils/Android.mk b/libutils/Android.mk
index 720443e..039ac1b 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -138,6 +138,19 @@
 
 # Include subdirectory makefiles
 # ============================================================
+include $(CLEAR_VARS)
+LOCAL_MODULE := SharedBufferTest
+LOCAL_STATIC_LIBRARIES := libutils libcutils
+LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_SRC_FILES := SharedBufferTest.cpp
+include $(BUILD_NATIVE_TEST)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := SharedBufferTest
+LOCAL_STATIC_LIBRARIES := libutils libcutils
+LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_SRC_FILES := SharedBufferTest.cpp
+include $(BUILD_HOST_NATIVE_TEST)
 
 # If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework
 # team really wants is to build the stuff defined by this makefile.