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

Commit 596e2217 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Convert libpixelflinger to Android.bp 

See build/soong/README.md for more information.

Test: cd system/core/libpixelflinger; mma
Change-Id: I2354e5bc6b0b8a10d598e3677bc63962f70bf7bc
parent 3a2bd498

libpixelflinger/Android.bp

0 → 100644
+115 −0
Original line number Diff line number Diff line 
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",

            ],

        },

    },

}

libpixelflinger/Android.mk

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
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))

libpixelflinger/tests/Android.bp

0 → 100644
+16 −0
Original line number Diff line number Diff line 
cc_defaults {

    name: "pixelflinger-tests",



    cflags: [

        "-Wall",

        "-Werror",

    ],



    header_libs: ["libpixelflinger_internal"],

    static_libs: [

        "libcutils",

        "liblog",

        "libpixelflinger",

        "libutils",

    ],

}

libpixelflinger/tests/Android.mk

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
include $(all-subdir-makefiles)

libpixelflinger/tests/arch-arm64/Android.bp

0 → 100644
+11 −0
Original line number Diff line number Diff line 
cc_defaults {

    name: "pixelflinger-tests-arm64",

    defaults: ["pixelflinger-tests"],



    enabled: false,

    arch: {

        arm64: {

            enabled: true,

        },

    },

}