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

Commit 5d051113 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Convert tests to Android.bp"

am: 35492448

Change-Id: I628a723fb5b790e81317456b0e2bd1456366585e
parents 893e8b54 35492448
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line

subdirs = [
    "angeles",
    "configdump",
    "EGLTest",
    "fillrate",
    "filter",
    "finish",
    "gl2_basic",
    "gl2_copyTexImage",
    "gl2_yuvtex",
    "gl_basic",
    "gl_perf",
    "gl_yuvtex", // just renders magenta frame, broken?
    "gralloc",
    "hwc",
    "lib",
]
+0 −15
Original line number Diff line number Diff line
dirs := \
	angeles \
	configdump \
	EGLTest \
	fillrate \
	filter \
	finish \
	gl2_basic \
	gl2_copyTexImage \
	gl2_yuvtex \
	gl_basic \
	gl_perf \
	gl_yuvtex \
	gralloc \
	include \
	lib \
	linetex \
	swapinterval \
	textures \
+31 −0
Original line number Diff line number Diff line

cc_test {

    name: "EGL_test",

    srcs: [
        "egl_cache_test.cpp",
        "EGL_test.cpp",
    ],

    shared_libs: [
        "android.hardware.configstore@1.0",
        "android.hardware.configstore-utils",
        "libEGL",
        "libbase",
        "libcutils",
        "libbinder",
        "libgui",
        "libhidlbase",
        "libhidltransport",
        "liblog",
        "libutils",
    ],

    include_dirs: [
        "bionic/libc/private",
        "frameworks/native/opengl/libs",
        "frameworks/native/opengl/libs/EGL",
    ],

}

opengl/tests/EGLTest/Android.mk

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line
# Build the unit tests.
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_MODULE := EGL_test

LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := \
    egl_cache_test.cpp \
    EGL_test.cpp \

LOCAL_SHARED_LIBRARIES := \
	android.hardware.configstore@1.0 \
	android.hardware.configstore-utils \
	libEGL \
	libcutils \
	libbinder \
	libhidlbase \
	libhidltransport \
	libutils \
	libgui \
	libbase \
	liblog \

LOCAL_C_INCLUDES := \
    bionic/libc/private \
    frameworks/native/opengl/libs \
    frameworks/native/opengl/libs/EGL \

# gold in binutils 2.22 will warn about the usage of mktemp
LOCAL_LDFLAGS += -Wl,--no-fatal-warnings

include $(BUILD_NATIVE_TEST)

# Include subdirectory makefiles
# ============================================================

# If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework
# team really wants is to build the stuff defined by this makefile.
ifeq (,$(ONE_SHOT_MAKEFILE))
include $(call first-makefiles-under,$(LOCAL_PATH))
endif
+22 −0
Original line number Diff line number Diff line
// Copyright 2006 The Android Open Source Project

cc_test {
    name: "angeles",

    srcs: [
        "app-linux.cpp",
        "demo.c",
    ],

    gtest: false,

    shared_libs: [
        "libEGL",
        "libGLESv1_CM",
        "libui",
        "libgui",
        "libutils",
    ],

    static_libs: ["libglTest"],
}
Loading