ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am b3b088e6: Merge "pixelflinger: make self-contained"

Browse source 
* commit 'b3b088e62308f8a61a27677a968a9e513a8582bc':
  pixelflinger: make self-contained
This commit is contained in:
Greg Hackmann 2015-03-19 19:49:54 +00:00 • committed by Android Git Automerger
commit 012326fbe9
9 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libpixelflinger/Android.mk
View file

@ -62,6 +62,8 @@ LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm)
LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64) LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64)
LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips) LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)
LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) 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_SHARED_LIBRARIES := libcutils liblog
# Really this should go away entirely or at least not depend on # Really this should go away entirely or at least not depend on

0
include/pixelflinger/format.h → libpixelflinger/include/pixelflinger/format.h
View file

0
include/pixelflinger/pixelflinger.h → libpixelflinger/include/pixelflinger/pixelflinger.h
View file

0
include/private/pixelflinger/ggl_context.h → libpixelflinger/include/private/pixelflinger/ggl_context.h
View file

0
include/private/pixelflinger/ggl_fixed.h → libpixelflinger/include/private/pixelflinger/ggl_fixed.h
View file

2
libpixelflinger/tests/arch-arm64/assembler/Android.mk
View file

@ -13,7 +13,7 @@ LOCAL_SHARED_LIBRARIES := \
libpixelflinger libpixelflinger
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/core/libpixelflinger $(LOCAL_PATH)/../../..
LOCAL_MODULE:= test-pixelflinger-arm64-assembler-test LOCAL_MODULE:= test-pixelflinger-arm64-assembler-test

3
libpixelflinger/tests/arch-arm64/disassembler/Android.mk
View file

@ -7,9 +7,6 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := LOCAL_SHARED_LIBRARIES :=
LOCAL_C_INCLUDES := \
system/core/libpixelflinger/codeflinger
LOCAL_MODULE:= test-pixelflinger-arm64-disassembler-test LOCAL_MODULE:= test-pixelflinger-arm64-disassembler-test
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests

2
libpixelflinger/tests/codegen/Android.mk
View file

@ -9,7 +9,7 @@ LOCAL_SHARED_LIBRARIES := \
libpixelflinger libpixelflinger
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/core/libpixelflinger $(LOCAL_PATH)/../..
LOCAL_MODULE:= test-opengl-codegen LOCAL_MODULE:= test-opengl-codegen

2
libpixelflinger/tests/gglmul/Android.mk
View file

@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := LOCAL_SHARED_LIBRARIES :=
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/core/libpixelflinger $(LOCAL_PATH)/../../include
LOCAL_MODULE:= test-pixelflinger-gglmul LOCAL_MODULE:= test-pixelflinger-gglmul