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

Commit efc3e37c authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Convert bootanimation to Android.bp

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

Test: cd frameworks/base/cmds/bootanimation; mma
Change-Id: I7e023ffc42f61ce9a215a958fbbd158a6a8352d7
parent 6dc4e652
Loading
Loading
Loading
Loading
+90 −0
Original line number Diff line number Diff line
cc_defaults {
    name: "bootanimation_defaults",

    cflags: [
        "-DGL_GLEXT_PROTOTYPES",
        "-DEGL_EGLEXT_PROTOTYPES",

        "-Wall",
        "-Werror",
        "-Wunused",
        "-Wunreachable-code",
    ],

    shared_libs: [
        "libandroidfw",
        "libbase",
        "libbinder",
        "libcutils",
        "liblog",
        "libutils",
    ],
}

// bootanimation executable
// =========================================================

cc_binary {
    name: "bootanimation",
    defaults: ["bootanimation_defaults"],

    shared_libs: [
        "libOpenSLES",
        "libbootanimation",
    ],

    srcs: [
        "BootAnimationUtil.cpp",

        "bootanimation_main.cpp",
        "audioplay.cpp",
    ],

    product_variables: {
        product_is_iot: {
            shared_libs: [
                "libandroidthings",
                "libandroidthings_protos",
                "libchrome",
                "libprotobuf-cpp-lite",
            ],
            static_libs: ["libjsoncpp"],
            srcs: [
                "iot/iotbootanimation_main.cpp",
                "iot/BootAction.cpp",
                "iot/BootParameters.cpp",
            ],
            exclude_srcs: [
                "bootanimation_main.cpp",
                "audioplay.cpp",
            ],
        },
    },

    init_rc: ["bootanim.rc"],
}

// libbootanimation
// ===========================================================

cc_library_shared {
    name: "libbootanimation",
    defaults: ["bootanimation_defaults"],

    srcs: ["BootAnimation.cpp"],

    shared_libs: [
        "libui",
        "libhwui",
        "libEGL",
        "libGLESv1_CM",
        "libgui",
        "libtinyalsa",
    ],

    product_variables: {
        product_is_iot: {
            init_rc: ["iot/bootanim_iot.rc"],
        },
    },
}

cmds/bootanimation/Android.mk

deleted100644 → 0
+0 −103
Original line number Diff line number Diff line
bootanimation_CommonCFlags = -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
bootanimation_CommonCFlags += -Wall -Werror -Wunused -Wunreachable-code


# bootanimation executable
# =========================================================

LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

LOCAL_CFLAGS += ${bootanimation_CommonCFlags}

LOCAL_SHARED_LIBRARIES := \
    libOpenSLES \
    libandroidfw \
    libbase \
    libbinder \
    libbootanimation \
    libcutils \
    liblog \
    libutils \

LOCAL_SRC_FILES:= \
    BootAnimationUtil.cpp \

ifeq ($(PRODUCT_IOT),true)

LOCAL_SHARED_LIBRARIES += \
    libandroidthings \
    libandroidthings_protos \
    libchrome \
    libprotobuf-cpp-lite \

LOCAL_STATIC_LIBRARIES += \
    libjsoncpp

LOCAL_SRC_FILES += \
    iot/iotbootanimation_main.cpp \
    iot/BootAction.cpp \
    iot/BootParameters.cpp \

else

LOCAL_SRC_FILES += \
    bootanimation_main.cpp \
    audioplay.cpp \

endif  # PRODUCT_IOT

LOCAL_MODULE:= bootanimation

LOCAL_INIT_RC := bootanim.rc

ifdef TARGET_32_BIT_SURFACEFLINGER
LOCAL_32_BIT_ONLY := true
endif

include $(BUILD_EXECUTABLE)


# libbootanimation
# ===========================================================

include $(CLEAR_VARS)
LOCAL_MODULE := libbootanimation
LOCAL_CFLAGS += ${bootanimation_CommonCFlags}

LOCAL_SRC_FILES:= \
    BootAnimation.cpp

LOCAL_CFLAGS += ${bootanimation_CommonCFlags}

LOCAL_C_INCLUDES += \
    external/tinyalsa/include \
    frameworks/wilhelm/include

LOCAL_SHARED_LIBRARIES := \
    libcutils \
    liblog \
    libandroidfw \
    libutils \
    libbinder \
    libui \
    libhwui \
    libEGL \
    libGLESv1_CM \
    libgui \
    libtinyalsa \
    libbase

ifeq ($(PRODUCT_IOT),true)

LOCAL_INIT_RC := iot/bootanim_iot.rc

endif # PRODUCT_IOT

ifdef TARGET_32_BIT_SURFACEFLINGER
LOCAL_32_BIT_ONLY := true
endif

include ${BUILD_SHARED_LIBRARY}

include $(call all-makefiles-under,$(LOCAL_PATH))
+49 −0
Original line number Diff line number Diff line
// Copyright (C) 2018 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.
//

// libbootanimation_iot_test
// ===========================================================
cc_test {
    name: "libbootanimation_iot_test",
    cflags: [
        "-Wall",
        "-Werror",
        "-Wunused",
        "-Wunreachable-code",
    ],

    shared_libs: [
        "libandroidthings",
        "libandroidthings_protos",
        "libbase",
        "libchrome",
        "liblog",
        "libprotobuf-cpp-lite",
    ],

    static_libs: ["libjsoncpp"],

    srcs: [
        "BootParameters.cpp",
        "BootParameters_test.cpp",
    ],

    enabled: false,
    product_variables: {
        product_is_iot: {
            enabled: true,
        },
    },
}

cmds/bootanimation/iot/Android.mk

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

ifeq ($(PRODUCT_IOT),true)

# libbootanimation_iot_test
# ===========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libbootanimation_iot_test
LOCAL_CFLAGS := -Wall -Werror -Wunused -Wunreachable-code

LOCAL_SHARED_LIBRARIES := \
    libandroidthings \
    libandroidthings_protos \
    libbase \
    libchrome \
    liblog \
    libprotobuf-cpp-lite \

LOCAL_STATIC_LIBRARIES += \
    libjsoncpp

LOCAL_SRC_FILES := \
    BootParameters.cpp \
    BootParameters_test.cpp \

include $(BUILD_NATIVE_TEST)

endif # PRODUCT_IOT