diff --git a/libpixelflinger/Android.bp b/libpixelflinger/Android.bp new file mode 100644 index 000000000..76d944418 --- /dev/null +++ b/libpixelflinger/Android.bp @@ -0,0 +1,115 @@ +cc_defaults { + name: "pixelflinger_defaults", + + cflags: [ + "-fstrict-aliasing", + "-fomit-frame-pointer", + "-Wall", + "-Werror", + "-Wno-unused-function", + ], + export_include_dirs: ["include"], + header_libs: ["libbase_headers"], + shared_libs: [ + "libcutils", + "liblog", + "libutils", + ], + + arch: { + arm: { + neon: { + cflags: ["-D__ARM_HAVE_NEON"], + }, + }, + }, +} + +cc_library_static { + name: "libpixelflinger-arm", + defaults: ["pixelflinger_defaults"], + + srcs: [ + "fixed.cpp", + "picker.cpp", + "pixelflinger.cpp", + "trap.cpp", + "scanline.cpp", + ], + + arch: { + arm: { + instruction_set: "arm", + }, + }, +} + +// For the tests to use +cc_library_headers { + name: "libpixelflinger_internal", + export_include_dirs: [ + "include", + ".", + ], +} + +cc_library { + name: "libpixelflinger", + defaults: ["pixelflinger_defaults"], + + srcs: [ + "codeflinger/ARMAssemblerInterface.cpp", + "codeflinger/ARMAssemblerProxy.cpp", + "codeflinger/CodeCache.cpp", + "codeflinger/GGLAssembler.cpp", + "codeflinger/load_store.cpp", + "codeflinger/blending.cpp", + "codeflinger/texturing.cpp", + "format.cpp", + "clear.cpp", + "raster.cpp", + "buffer.cpp", + ], + whole_static_libs: ["libpixelflinger-arm"], + + arch: { + arm: { + srcs: [ + "codeflinger/ARMAssembler.cpp", + "codeflinger/disassem.c", + "col32cb16blend.S", + "t32cb16blend.S", + ], + + neon: { + srcs: ["col32cb16blend_neon.S"], + }, + }, + arm64: { + srcs: [ + "codeflinger/Arm64Assembler.cpp", + "codeflinger/Arm64Disassembler.cpp", + "arch-arm64/col32cb16blend.S", + "arch-arm64/t32cb16blend.S", + ], + }, + mips: { + mips32r6: { + srcs: [ + "codeflinger/MIPSAssembler.cpp", + "codeflinger/mips_disassem.c", + "arch-mips/t32cb16blend.S", + ], + }, + }, + mips64: { + srcs: [ + "codeflinger/MIPSAssembler.cpp", + "codeflinger/MIPS64Assembler.cpp", + "codeflinger/mips64_disassem.c", + "arch-mips64/col32cb16blend.S", + "arch-mips64/t32cb16blend.S", + ], + }, + }, +} diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk deleted file mode 100644 index 8c80f6a65..000000000 --- a/libpixelflinger/Android.mk +++ /dev/null @@ -1,81 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# -# C/C++ and ARMv5 objects -# - -include $(CLEAR_VARS) -PIXELFLINGER_SRC_FILES:= \ - codeflinger/ARMAssemblerInterface.cpp \ - codeflinger/ARMAssemblerProxy.cpp \ - codeflinger/CodeCache.cpp \ - codeflinger/GGLAssembler.cpp \ - codeflinger/load_store.cpp \ - codeflinger/blending.cpp \ - codeflinger/texturing.cpp \ - fixed.cpp.arm \ - picker.cpp.arm \ - pixelflinger.cpp.arm \ - trap.cpp.arm \ - scanline.cpp.arm \ - format.cpp \ - clear.cpp \ - raster.cpp \ - buffer.cpp - -PIXELFLINGER_CFLAGS := -fstrict-aliasing -fomit-frame-pointer -PIXELFLINGER_CFLAGS += -Wall -Werror -PIXELFLINGER_CFLAGS += -Wno-unused-function - -PIXELFLINGER_SRC_FILES_arm := \ - codeflinger/ARMAssembler.cpp \ - codeflinger/disassem.c \ - col32cb16blend.S \ - t32cb16blend.S \ - -ifeq ($(ARCH_ARM_HAVE_NEON),true) -PIXELFLINGER_SRC_FILES_arm += col32cb16blend_neon.S -PIXELFLINGER_CFLAGS_arm += -D__ARM_HAVE_NEON -endif - -PIXELFLINGER_SRC_FILES_arm64 := \ - codeflinger/Arm64Assembler.cpp \ - codeflinger/Arm64Disassembler.cpp \ - arch-arm64/col32cb16blend.S \ - arch-arm64/t32cb16blend.S \ - -ifndef ARCH_MIPS_REV6 -PIXELFLINGER_SRC_FILES_mips := \ - codeflinger/MIPSAssembler.cpp \ - codeflinger/mips_disassem.c \ - arch-mips/t32cb16blend.S \ - -endif - -PIXELFLINGER_SRC_FILES_mips64 := \ - codeflinger/MIPSAssembler.cpp \ - codeflinger/MIPS64Assembler.cpp \ - codeflinger/mips64_disassem.c \ - arch-mips64/col32cb16blend.S \ - arch-mips64/t32cb16blend.S \ - -# -# Shared library -# - -LOCAL_MODULE:= libpixelflinger -LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES) -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_SRC_FILES_mips64 := $(PIXELFLINGER_SRC_FILES_mips64) -LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) -LOCAL_HEADER_LIBRARIES := libbase_headers -LOCAL_SHARED_LIBRARIES := libcutils liblog libutils - -include $(BUILD_SHARED_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/libpixelflinger/tests/Android.bp b/libpixelflinger/tests/Android.bp new file mode 100644 index 000000000..820a84d2a --- /dev/null +++ b/libpixelflinger/tests/Android.bp @@ -0,0 +1,16 @@ +cc_defaults { + name: "pixelflinger-tests", + + cflags: [ + "-Wall", + "-Werror", + ], + + header_libs: ["libpixelflinger_internal"], + static_libs: [ + "libcutils", + "liblog", + "libpixelflinger", + "libutils", + ], +} diff --git a/libpixelflinger/tests/Android.mk b/libpixelflinger/tests/Android.mk deleted file mode 100644 index 65711611c..000000000 --- a/libpixelflinger/tests/Android.mk +++ /dev/null @@ -1 +0,0 @@ -include $(all-subdir-makefiles) diff --git a/libpixelflinger/tests/arch-arm64/Android.bp b/libpixelflinger/tests/arch-arm64/Android.bp new file mode 100644 index 000000000..2f5586aa9 --- /dev/null +++ b/libpixelflinger/tests/arch-arm64/Android.bp @@ -0,0 +1,11 @@ +cc_defaults { + name: "pixelflinger-tests-arm64", + defaults: ["pixelflinger-tests"], + + enabled: false, + arch: { + arm64: { + enabled: true, + }, + }, +} diff --git a/libpixelflinger/tests/arch-arm64/Android.mk b/libpixelflinger/tests/arch-arm64/Android.mk deleted file mode 100644 index ca58b4b25..000000000 --- a/libpixelflinger/tests/arch-arm64/Android.mk +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(TARGET_ARCH),arm64) -include $(all-subdir-makefiles) -endif diff --git a/libpixelflinger/tests/arch-arm64/assembler/Android.bp b/libpixelflinger/tests/arch-arm64/assembler/Android.bp new file mode 100644 index 000000000..003f48576 --- /dev/null +++ b/libpixelflinger/tests/arch-arm64/assembler/Android.bp @@ -0,0 +1,9 @@ +cc_test { + name: "test-pixelflinger-arm64-assembler-test", + defaults: ["pixelflinger-tests-arm64"], + + srcs: [ + "arm64_assembler_test.cpp", + "asm_test_jacket.S", + ], +} diff --git a/libpixelflinger/tests/arch-arm64/assembler/Android.mk b/libpixelflinger/tests/arch-arm64/assembler/Android.mk deleted file mode 100644 index db5dc4df9..000000000 --- a/libpixelflinger/tests/arch-arm64/assembler/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - arm64_assembler_test.cpp\ - asm_test_jacket.S - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libpixelflinger - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../.. - -LOCAL_MODULE:= test-pixelflinger-arm64-assembler-test - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_MODULE_TAGS := tests - -LOCAL_MULTILIB := 64 - -include $(BUILD_NATIVE_TEST) diff --git a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.bp b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.bp new file mode 100644 index 000000000..e640aeb74 --- /dev/null +++ b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.bp @@ -0,0 +1,6 @@ +cc_test { + name: "test-pixelflinger-arm64-col32cb16blend", + defaults: ["pixelflinger-tests-arm64"], + + srcs: ["col32cb16blend_test.c"], +} diff --git a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk b/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk deleted file mode 100644 index 3096232b8..000000000 --- a/libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - col32cb16blend_test.c \ - ../../../arch-arm64/col32cb16blend.S - -LOCAL_SHARED_LIBRARIES := - -LOCAL_C_INCLUDES := - -LOCAL_MODULE:= test-pixelflinger-arm64-col32cb16blend - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_MODULE_TAGS := tests - -LOCAL_MULTILIB := 64 - -include $(BUILD_NATIVE_TEST) diff --git a/libpixelflinger/tests/arch-arm64/disassembler/Android.bp b/libpixelflinger/tests/arch-arm64/disassembler/Android.bp new file mode 100644 index 000000000..38dc99a5b --- /dev/null +++ b/libpixelflinger/tests/arch-arm64/disassembler/Android.bp @@ -0,0 +1,6 @@ +cc_test { + name: "test-pixelflinger-arm64-disassembler-test", + defaults: ["pixelflinger-tests-arm64"], + + srcs: ["arm64_diassembler_test.cpp"], +} diff --git a/libpixelflinger/tests/arch-arm64/disassembler/Android.mk b/libpixelflinger/tests/arch-arm64/disassembler/Android.mk deleted file mode 100644 index 78f12af9d..000000000 --- a/libpixelflinger/tests/arch-arm64/disassembler/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - arm64_diassembler_test.cpp \ - ../../../codeflinger/Arm64Disassembler.cpp - -LOCAL_SHARED_LIBRARIES := - -LOCAL_MODULE:= test-pixelflinger-arm64-disassembler-test - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_MODULE_TAGS := tests - -LOCAL_MULTILIB := 64 - -include $(BUILD_NATIVE_TEST) diff --git a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.bp b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.bp new file mode 100644 index 000000000..9d060d136 --- /dev/null +++ b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.bp @@ -0,0 +1,6 @@ +cc_test { + name: "test-pixelflinger-arm64-t32cb16blend", + defaults: ["pixelflinger-tests-arm64"], + + srcs: ["t32cb16blend_test.c"], +} diff --git a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk b/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk deleted file mode 100644 index 664347f50..000000000 --- a/libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - t32cb16blend_test.c \ - ../../../arch-arm64/t32cb16blend.S - -LOCAL_SHARED_LIBRARIES := - -LOCAL_C_INCLUDES := - -LOCAL_MODULE:= test-pixelflinger-arm64-t32cb16blend - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_MODULE_TAGS := tests - -LOCAL_MULTILIB := 64 - -include $(BUILD_NATIVE_TEST) diff --git a/libpixelflinger/tests/arch-mips/Android.bp b/libpixelflinger/tests/arch-mips/Android.bp new file mode 100644 index 000000000..2ca272178 --- /dev/null +++ b/libpixelflinger/tests/arch-mips/Android.bp @@ -0,0 +1,11 @@ +cc_defaults { + name: "pixelflinger-tests-mips", + defaults: ["pixelflinger-tests"], + + enabled: false, + arch: { + mips: { + enabled: true, + }, + }, +} diff --git a/libpixelflinger/tests/arch-mips/Android.mk b/libpixelflinger/tests/arch-mips/Android.mk deleted file mode 100644 index fe6979ef6..000000000 --- a/libpixelflinger/tests/arch-mips/Android.mk +++ /dev/null @@ -1,6 +0,0 @@ -ifeq ($(TARGET_ARCH),mips) -include $(all-subdir-makefiles) -endif -ifeq ($(TARGET_ARCH),mipsel) -include $(all-subdir-makefiles) -endif diff --git a/libpixelflinger/tests/arch-mips/col32cb16blend/Android.bp b/libpixelflinger/tests/arch-mips/col32cb16blend/Android.bp new file mode 100644 index 000000000..45bfe29e4 --- /dev/null +++ b/libpixelflinger/tests/arch-mips/col32cb16blend/Android.bp @@ -0,0 +1,6 @@ +cc_test { + name: "test-pixelflinger-mips-col32cb16blend", + defaults: ["pixelflinger-tests-mips"], + + srcs: ["col32cb16blend_test.c"], +} diff --git a/libpixelflinger/tests/arch-mips/col32cb16blend/Android.mk b/libpixelflinger/tests/arch-mips/col32cb16blend/Android.mk deleted file mode 100644 index 40f197f3b..000000000 --- a/libpixelflinger/tests/arch-mips/col32cb16blend/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - col32cb16blend_test.c \ - ../../../arch-mips/col32cb16blend.S - -LOCAL_SHARED_LIBRARIES := - -LOCAL_C_INCLUDES := - -LOCAL_MODULE:= test-pixelflinger-mips-col32cb16blend - -LOCAL_MODULE_TAGS := tests - -LOCAL_MULTILIB := 32 - -include $(BUILD_NATIVE_TEST) diff --git a/libpixelflinger/tests/arch-mips/t32cb16blend/Android.bp b/libpixelflinger/tests/arch-mips/t32cb16blend/Android.bp new file mode 100644 index 000000000..069e97c55 --- /dev/null +++ b/libpixelflinger/tests/arch-mips/t32cb16blend/Android.bp @@ -0,0 +1,6 @@ +cc_test { + name: "test-pixelflinger-mips-t32cb16blend", + defaults: ["pixelflinger-tests-mips"], + + srcs: ["t32cb16blend_test.c"], +} diff --git a/libpixelflinger/tests/arch-mips/t32cb16blend/Android.mk b/libpixelflinger/tests/arch-mips/t32cb16blend/Android.mk deleted file mode 100644 index d0c0ae4dc..000000000 --- a/libpixelflinger/tests/arch-mips/t32cb16blend/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - t32cb16blend_test.c \ - ../../../arch-mips/t32cb16blend.S - -LOCAL_SHARED_LIBRARIES := - -LOCAL_C_INCLUDES := - -LOCAL_MODULE:= test-pixelflinger-mips-t32cb16blend - -LOCAL_MODULE_TAGS := tests - -LOCAL_MULTILIB := 32 - -include $(BUILD_NATIVE_TEST) diff --git a/libpixelflinger/tests/arch-mips64/Android.bp b/libpixelflinger/tests/arch-mips64/Android.bp new file mode 100644 index 000000000..ba55d62de --- /dev/null +++ b/libpixelflinger/tests/arch-mips64/Android.bp @@ -0,0 +1,11 @@ +cc_defaults { + name: "pixelflinger-tests-mips64", + defaults: ["pixelflinger-tests"], + + enabled: false, + arch: { + mips64: { + enabled: true, + }, + }, +} diff --git a/libpixelflinger/tests/arch-mips64/Android.mk b/libpixelflinger/tests/arch-mips64/Android.mk deleted file mode 100644 index 3b1c64ec2..000000000 --- a/libpixelflinger/tests/arch-mips64/Android.mk +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(TARGET_ARCH),mips64) -include $(all-subdir-makefiles) -endif diff --git a/libpixelflinger/tests/arch-mips64/assembler/Android.bp b/libpixelflinger/tests/arch-mips64/assembler/Android.bp new file mode 100644 index 000000000..b67205328 --- /dev/null +++ b/libpixelflinger/tests/arch-mips64/assembler/Android.bp @@ -0,0 +1,9 @@ +cc_test { + name: "test-pixelflinger-mips64-assembler-test", + defaults: ["pixelflinger-tests-mips64"], + + srcs: [ + "mips64_assembler_test.cpp", + "asm_mips_test_jacket.S", + ], +} diff --git a/libpixelflinger/tests/arch-mips64/assembler/Android.mk b/libpixelflinger/tests/arch-mips64/assembler/Android.mk deleted file mode 100644 index 469996126..000000000 --- a/libpixelflinger/tests/arch-mips64/assembler/Android.mk +++ /dev/null @@ -1,21 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - mips64_assembler_test.cpp\ - asm_mips_test_jacket.S - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libpixelflinger - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../.. - -LOCAL_MODULE:= test-pixelflinger-mips64-assembler-test - -LOCAL_MODULE_TAGS := tests - -LOCAL_MULTILIB := 64 - -include $(BUILD_NATIVE_TEST) diff --git a/libpixelflinger/tests/arch-mips64/col32cb16blend/Android.bp b/libpixelflinger/tests/arch-mips64/col32cb16blend/Android.bp new file mode 100644 index 000000000..bfc6ae9bb --- /dev/null +++ b/libpixelflinger/tests/arch-mips64/col32cb16blend/Android.bp @@ -0,0 +1,6 @@ +cc_test { + name: "test-pixelflinger-mips64-col32cb16blend", + defaults: ["pixelflinger-tests-mips64"], + + srcs: ["col32cb16blend_test.c"], +} diff --git a/libpixelflinger/tests/arch-mips64/col32cb16blend/Android.mk b/libpixelflinger/tests/arch-mips64/col32cb16blend/Android.mk deleted file mode 100644 index 7d4177ecb..000000000 --- a/libpixelflinger/tests/arch-mips64/col32cb16blend/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - col32cb16blend_test.c \ - ../../../arch-mips64/col32cb16blend.S - -LOCAL_SHARED_LIBRARIES := - -LOCAL_C_INCLUDES := - -LOCAL_MODULE:= test-pixelflinger-mips64-col32cb16blend - -LOCAL_MODULE_TAGS := tests - -LOCAL_MULTILIB := 64 - -include $(BUILD_NATIVE_TEST) diff --git a/libpixelflinger/tests/arch-mips64/disassembler/Android.bp b/libpixelflinger/tests/arch-mips64/disassembler/Android.bp new file mode 100644 index 000000000..96bf9e971 --- /dev/null +++ b/libpixelflinger/tests/arch-mips64/disassembler/Android.bp @@ -0,0 +1,6 @@ +cc_test { + name: "test-pixelflinger-mips64-disassembler-test", + defaults: ["pixelflinger-tests-mips64"], + + srcs: ["mips64_disassembler_test.cpp"], +} diff --git a/libpixelflinger/tests/arch-mips64/disassembler/Android.mk b/libpixelflinger/tests/arch-mips64/disassembler/Android.mk deleted file mode 100644 index 4e72b5784..000000000 --- a/libpixelflinger/tests/arch-mips64/disassembler/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - mips64_disassembler_test.cpp \ - ../../../codeflinger/mips64_disassem.c - -LOCAL_SHARED_LIBRARIES := - -LOCAL_MODULE:= test-pixelflinger-mips64-disassembler-test - -LOCAL_MODULE_TAGS := tests - -LOCAL_MULTILIB := 64 - -include $(BUILD_NATIVE_TEST) diff --git a/libpixelflinger/tests/codegen/Android.bp b/libpixelflinger/tests/codegen/Android.bp new file mode 100644 index 000000000..7e4bcfb3c --- /dev/null +++ b/libpixelflinger/tests/codegen/Android.bp @@ -0,0 +1,12 @@ +cc_test { + name: "test-opengl-codegen", + defaults: ["pixelflinger-tests"], + + srcs: ["codegen.cpp"], + + arch: { + arm: { + instruction_set: "arm", + }, + }, +} diff --git a/libpixelflinger/tests/codegen/Android.mk b/libpixelflinger/tests/codegen/Android.mk deleted file mode 100644 index 72d71efd3..000000000 --- a/libpixelflinger/tests/codegen/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - codegen.cpp.arm - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libpixelflinger - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../.. - -LOCAL_MODULE:= test-opengl-codegen - -LOCAL_CFLAGS:= -Wall -Werror - -LOCAL_MODULE_TAGS := tests - -include $(BUILD_NATIVE_TEST) diff --git a/libpixelflinger/tests/gglmul/Android.bp b/libpixelflinger/tests/gglmul/Android.bp new file mode 100644 index 000000000..288337b71 --- /dev/null +++ b/libpixelflinger/tests/gglmul/Android.bp @@ -0,0 +1,12 @@ +cc_test { + name: "test-pixelflinger-gglmul", + + srcs: ["gglmul_test.cpp"], + + header_libs: ["libpixelflinger_internal"], + + cflags: [ + "-Wall", + "-Werror", + ], +} diff --git a/libpixelflinger/tests/gglmul/Android.mk b/libpixelflinger/tests/gglmul/Android.mk deleted file mode 100644 index 67f358fc5..000000000 --- a/libpixelflinger/tests/gglmul/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - gglmul_test.cpp - -LOCAL_SHARED_LIBRARIES := - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../include - -LOCAL_MODULE:= test-pixelflinger-gglmul - -LOCAL_CFLAGS:= -Wall -Werror - -LOCAL_MODULE_TAGS := tests - -include $(BUILD_NATIVE_TEST)