Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69de9ac0 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "move tinyutils into its own namespace" into jb-mr2-dev

parents 7f8fb3ff 9857d99e

libpixelflinger/Android.mk

+2 −9
Original line number Diff line number Diff line
@@ -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

#

libpixelflinger/codeflinger/ARMAssembler.cpp

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 


#include <private/pixelflinger/ggl_context.h>



#include "codeflinger/ARMAssembler.h"

#include "codeflinger/CodeCache.h"

#include "codeflinger/disassem.h"

#include "ARMAssembler.h"

#include "CodeCache.h"

#include "disassem.h"



// ----------------------------------------------------------------------------

libpixelflinger/codeflinger/ARMAssembler.h

+2 −3
Original line number Diff line number Diff line
@@ -25,9 +25,8 @@ 
#include "tinyutils/KeyedVector.h"

#include "tinyutils/smartpointer.h"



#include "tinyutils/smartpointer.h"

#include "codeflinger/ARMAssemblerInterface.h"

#include "codeflinger/CodeCache.h"

#include "ARMAssemblerInterface.h"

#include "CodeCache.h"



namespace android {

libpixelflinger/codeflinger/ARMAssemblerInterface.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <sys/types.h>



#include <cutils/log.h>

#include "codeflinger/ARMAssemblerInterface.h"

#include "ARMAssemblerInterface.h"



namespace android {

libpixelflinger/codeflinger/ARMAssemblerProxy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <stdint.h>

#include <sys/types.h>



#include "codeflinger/ARMAssemblerProxy.h"

#include "ARMAssemblerProxy.h"



namespace android {