summaryrefslogtreecommitdiffstats
path: root/libpixelflinger/Android.mk
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-04-01 15:17:55 -0700
committerMathias Agopian <mathias@google.com>2013-04-01 16:50:43 -0700
commit9857d99eecc389389da261a72461322d5cfb8eeb (patch)
tree2de3f96ffa093a633b93b246902bb6a506ba053f /libpixelflinger/Android.mk
parentd67bbab6d873c073fa5c3bdb93e8f32106898123 (diff)
downloadsystem_core-9857d99eecc389389da261a72461322d5cfb8eeb.zip
system_core-9857d99eecc389389da261a72461322d5cfb8eeb.tar.gz
system_core-9857d99eecc389389da261a72461322d5cfb8eeb.tar.bz2
move tinyutils into its own namespace
I was fed-up with the constant conflicts in Eclipse with the "libutils" version. Also fix a few copyright notices. Change-Id: I8ffcb845af4b5d0d178f5565f64dfcfbfa27fcd6
Diffstat (limited to 'libpixelflinger/Android.mk')
-rw-r--r--libpixelflinger/Android.mk11
1 files changed, 2 insertions, 9 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index 488003f..85d2c9c 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -16,8 +16,8 @@ PIXELFLINGER_SRC_FILES:= \
codeflinger/blending.cpp \
codeflinger/texturing.cpp \
codeflinger/disassem.c \
- tinyutils/SharedBuffer.cpp \
- tinyutils/VectorImpl.cpp \
+ codeflinger/tinyutils/SharedBuffer.cpp \
+ codeflinger/tinyutils/VectorImpl.cpp \
fixed.cpp.arm \
picker.cpp.arm \
pixelflinger.cpp.arm \
@@ -52,13 +52,6 @@ endif
LOCAL_SHARED_LIBRARIES := libcutils
-ifneq ($(TARGET_ARCH),arm)
-# Required to define logging functions on the simulator.
-# TODO: move the simulator logging functions into libcutils with
-# the rest of the basic log stuff.
-LOCAL_SHARED_LIBRARIES += libutils
-endif
-
#
# Shared library
#