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

Commit 7ee83f62 authored by Tao Bao's avatar Tao Bao
Browse files

minui: Move to Soong. 

Note that although libminui says "shared_libs" in Android.bp file,
`recovery` binary will still statically link the libs, until we drop the
`LOCAL_FORCE_STATIC_EXECUTABLE := true` flag from `recovery` module.

Bug: 110380063
Test: `mmma -j bootable/recovery` with aosp_taimen-userdebug
Test: Boot into recovery and `Run graphics test`.
Change-Id: I48785d161dfe52eb01667e938d9c3f0a497b61a2
parent ebc04d1e

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ include $(BUILD_EXECUTABLE) 


include \

    $(LOCAL_PATH)/boot_control/Android.mk \

    $(LOCAL_PATH)/minui/Android.mk \

    $(LOCAL_PATH)/tests/Android.mk \

    $(LOCAL_PATH)/updater/Android.mk \

    $(LOCAL_PATH)/updater_sample/Android.mk \

minui/Android.bp

0 → 100644
+46 −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.



cc_library {

    name: "libminui",



    defaults: [

        "recovery_defaults",

    ],



    export_include_dirs: [

        "include",

    ],



    srcs: [

        "events.cpp",

        "graphics.cpp",

        "graphics_adf.cpp",

        "graphics_drm.cpp",

        "graphics_fbdev.cpp",

        "resources.cpp",

    ],



    whole_static_libs: [

        "libadf",

        "libdrm",

        "libsync_recovery",

    ],



    shared_libs: [

        "libbase",

        "libpng",

        "libz",

    ],

}

minui/Android.mk

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



# libminui (static library)

# ===============================

include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

    events.cpp \

    graphics.cpp \

    graphics_adf.cpp \

    graphics_drm.cpp \

    graphics_fbdev.cpp \

    resources.cpp \



LOCAL_WHOLE_STATIC_LIBRARIES := \

    libadf \

    libdrm \

    libsync_recovery



LOCAL_STATIC_LIBRARIES := \

    libpng \

    libbase



LOCAL_CFLAGS := -Wall -Werror

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include



LOCAL_MODULE := libminui



include $(BUILD_STATIC_LIBRARY)



# libminui (shared library)

# ===============================

# Used by OEMs for factory test images.

include $(CLEAR_VARS)

LOCAL_MODULE := libminui

LOCAL_WHOLE_STATIC_LIBRARIES += libminui

LOCAL_SHARED_LIBRARIES := \

    libpng \

    libbase



LOCAL_CFLAGS := -Wall -Werror

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

include $(BUILD_SHARED_LIBRARY)