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

Commit 142afb79 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert flatland to Android.bp" into main am: 43c5b587 am: 75ea449e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2910682



Change-Id: Ibf1c438aeff7228d146f8a7e3d7f94fbef1701b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d91089b4 75ea449e

cmds/flatland/Android.bp

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at:

 *

 * http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package {

    // See: http://go/android-license-faq

    default_applicable_licenses: [

        "frameworks_native_license",

    ],

}



cc_benchmark {

    name: "flatland",

    auto_gen_config: false,

    srcs: [

        "Composers.cpp",

        "GLHelper.cpp",

        "Renderers.cpp",

        "Main.cpp",

    ],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    compile_multilib: "both",

    multilib: {

        lib32: {

            stem: "flatland",

        },

        lib64: {

            stem: "flatland64",

        },

    },

    shared_libs: [

        "libEGL",

        "libGLESv2",

        "libcutils",

        "libgui",

        "libui",

        "libutils",

    ],

}

cmds/flatland/Android.mk

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
local_target_dir := $(TARGET_OUT_DATA)/local/tmp

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES:=   \

    Composers.cpp   \

    GLHelper.cpp    \

    Renderers.cpp   \

    Main.cpp        \



LOCAL_CFLAGS := -Wall -Werror



LOCAL_MODULE:= flatland

LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS:= notice

LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../../NOTICE



LOCAL_MODULE_TAGS := tests



LOCAL_MODULE_PATH := $(local_target_dir)

LOCAL_MULTILIB := both

LOCAL_MODULE_STEM_32 := flatland

LOCAL_MODULE_STEM_64 := flatland64

LOCAL_SHARED_LIBRARIES := \

    libEGL      \

    libGLESv2   \

    libcutils   \

    libgui      \

    libui       \

    libutils    \



include $(BUILD_EXECUTABLE)