diff options
| author | Narayan Kamath <narayan@google.com> | 2015-08-28 12:59:48 +0100 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-09-28 17:08:35 -0700 |
| commit | 6b667fddeb871338ac7b42d2a005f3d933004e15 (patch) | |
| tree | 956db0c13d966667726bafcda1e7c6ccc5abcf45 /libpixelflinger/Android.mk | |
| parent | bb0c180e62703c2068a1b2c9f8ba6d634bf1553c (diff) | |
| download | system_core-6b667fddeb871338ac7b42d2a005f3d933004e15.zip system_core-6b667fddeb871338ac7b42d2a005f3d933004e15.tar.gz system_core-6b667fddeb871338ac7b42d2a005f3d933004e15.tar.bz2 | |
libutils: Fix integer overflows in VectorImpl.
Use external/safe-iop to check for overflows on arithmetic
operations.
Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.
Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.
bug: 22953624
Change-Id: I46b1ae8ca1f3a010be13aca36a091e76a97a7b70
Diffstat (limited to 'libpixelflinger/Android.mk')
| -rw-r--r-- | libpixelflinger/Android.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index 697db25..f02da7f 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -14,8 +14,6 @@ PIXELFLINGER_SRC_FILES:= \ codeflinger/load_store.cpp \ codeflinger/blending.cpp \ codeflinger/texturing.cpp \ - codeflinger/tinyutils/SharedBuffer.cpp \ - codeflinger/tinyutils/VectorImpl.cpp \ fixed.cpp.arm \ picker.cpp.arm \ pixelflinger.cpp.arm \ @@ -63,8 +61,9 @@ LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64) LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips) LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) -LOCAL_SHARED_LIBRARIES := libcutils liblog +LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) \ + external/safe-iop/include +LOCAL_SHARED_LIBRARIES := libcutils liblog libutils # Really this should go away entirely or at least not depend on # libhardware, but this at least gets us built. |