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

Commit 871dda3d authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Convert libui to Android.bp

Along with the libinput tests, which depend on libui. For more
information on Soong, see build/soong/README.md

Change-Id: Id4fbeb114d03e37556dca59a2c9f5c9abb0a1825
parent fe37d517
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -58,3 +58,5 @@ cc_library {
        },
    },
}

subdirs = ["tests"]

libs/input/Android.mk

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line
# Copyright (C) 2013 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.

LOCAL_PATH:= $(call my-dir)

# 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
+29 −0
Original line number Diff line number Diff line
// Build the unit tests.
cc_test {
    name: "libinput_tests",
    test_per_src: true,
    srcs: [
        "InputChannel_test.cpp",
        "InputEvent_test.cpp",
        "InputPublisherAndConsumer_test.cpp",
    ],
    shared_libs: [
        "libinput",
        "libcutils",
        "libutils",
        "libbinder",
        "libui",
    ]
}

// NOTE: This is a compile time test, and does not need to be
// run. All assertions are static_asserts and will fail during
// buildtime if something's wrong.
cc_library_static {
    name: "StructLayout_test",
    srcs: ["StructLayout_test.cpp"],
    cflags: [
        "-std=c++11",
        "-O0",
    ],
}

libs/input/tests/Android.mk

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line
# Build the unit tests.
LOCAL_PATH:= $(call my-dir)

# Build the unit tests.
test_src_files := \
    InputChannel_test.cpp \
    InputEvent_test.cpp \
    InputPublisherAndConsumer_test.cpp

shared_libraries := \
    libinput \
    libcutils \
    libutils \
    libbinder \
    libui \

$(foreach file,$(test_src_files), \
    $(eval include $(CLEAR_VARS)) \
    $(eval LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk) \
    $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
    $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \
    $(eval LOCAL_SRC_FILES := $(file)) \
    $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
    $(eval include $(BUILD_NATIVE_TEST)) \
)

# NOTE: This is a compile time test, and does not need to be
# run. All assertions are static_asserts and will fail during
# buildtime if something's wrong.
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES := StructLayout_test.cpp
LOCAL_MODULE := StructLayout_test
LOCAL_CFLAGS := -std=c++11 -O0
LOCAL_MULTILIB := both
include $(BUILD_STATIC_LIBRARY)


# Build the manual test programs.
include $(call all-makefiles-under, $(LOCAL_PATH))

libs/ui/Android.bp

0 → 100644
+69 −0
Original line number Diff line number Diff line
// Copyright (C) 2010 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.

cc_library_shared {
    name: "libui",

    clang: true,
    cppflags: [
        "-std=c++1y",
        "-Weverything",
        "-Werror",

        // The static constructors and destructors in this library have not been noted to
        // introduce significant overheads
        "-Wno-exit-time-destructors",
        "-Wno-global-constructors",

        // We only care about compiling as C++14
        "-Wno-c++98-compat-pedantic",

        // We use four-character constants for the GraphicBuffer header, and don't care
        // that they're non-portable as long as they're consistent within one execution
        "-Wno-four-char-constants",

        // Don't warn about struct padding
        "-Wno-padded",
    ],

    sanitize: {
        //misc_undefined: ["integer"],
    },

    srcs: [
        "Fence.cpp",
        "FrameStats.cpp",
        "Gralloc1.cpp",
        "Gralloc1On0Adapter.cpp",
        "GraphicBuffer.cpp",
        "GraphicBufferAllocator.cpp",
        "GraphicBufferMapper.cpp",
        "HdrCapabilities.cpp",
        "PixelFormat.cpp",
        "Rect.cpp",
        "Region.cpp",
        "UiConfig.cpp",
    ],

    shared_libs: [
        "libbinder",
        "libcutils",
        "libhardware",
        "libsync",
        "libutils",
        "liblog",
    ],
}

subdirs = ["tests"]
Loading