am 3f13e2fa: am 021efd1b: Merge "pixelflinger: make self-contained"

* commit '3f13e2fa3eaecc2571159cb4e3cc7dd28d2d536e':
  pixelflinger: make self-contained
This commit is contained in:
Greg Hackmann 2015-03-16 18:04:05 +00:00 committed by Android Git Automerger
commit 6205750c75
9 changed files with 5 additions and 6 deletions

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_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
# Really this should go away entirely or at least not depend on

View file

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

View file

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

View file

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

View file

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