diff options
| author | Sergio Giro <sgiro@google.com> | 2015-08-18 17:36:50 +0100 |
|---|---|---|
| committer | ] <sgiro@google.com> | 2015-08-25 17:40:47 +0100 |
| commit | d95e47f13633feac9adb4ec5ce29392cfb628591 (patch) | |
| tree | 26356da86e858df6d4b281f1b5f2b83a1d629d4c /libutils/Android.mk | |
| parent | 219a006f89a5448a9a6eeb1f37ad0088e85bd3f8 (diff) | |
| download | system_core-d95e47f13633feac9adb4ec5ce29392cfb628591.zip system_core-d95e47f13633feac9adb4ec5ce29392cfb628591.tar.gz system_core-d95e47f13633feac9adb4ec5ce29392cfb628591.tar.bz2 | |
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
(cherry picked from commit 66b6eb9490beeeabc804d790c1c4060ce047afd4)
Change-Id: I363f49b5b3c6b7b3ac08cba2c14d72c431588c5a
Diffstat (limited to 'libutils/Android.mk')
| -rw-r--r-- | libutils/Android.mk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk index 40cd31e..d1ed997 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -108,6 +108,22 @@ LOCAL_CFLAGS := -Werror include $(BUILD_SHARED_LIBRARY) +# 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) # Build the tests in the tests/ subdirectory. include $(call first-makefiles-under,$(LOCAL_PATH)) |