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

Commit ad20b763 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "minui: Export minui/minui.h." 

am: 13d15af0

Change-Id: I12755c0fa6b184e68b49899e1cf589161e24eb62
parents 421d9270 13d15af0

Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -151,7 +151,11 @@ LOCAL_SRC_FILES := \ 
    asn1_decoder.cpp \

    verifier.cpp \

    ui.cpp

LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase

LOCAL_STATIC_LIBRARIES := \

    libminui \

    libcrypto_utils \

    libcrypto \

    libbase

LOCAL_CFLAGS := -Werror

include $(BUILD_STATIC_LIBRARY)

minui/Android.mk

+24 −7
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)

include $(CLEAR_VARS)
@@ -9,16 +23,18 @@ LOCAL_SRC_FILES := \ 
    graphics_fbdev.cpp \

    resources.cpp \



LOCAL_WHOLE_STATIC_LIBRARIES += libadf

LOCAL_WHOLE_STATIC_LIBRARIES += libdrm

LOCAL_WHOLE_STATIC_LIBRARIES += libsync_recovery

LOCAL_STATIC_LIBRARIES += libpng

LOCAL_WHOLE_STATIC_LIBRARIES := \

    libadf \

    libdrm \

    libsync_recovery



LOCAL_STATIC_LIBRARIES := libpng

LOCAL_CFLAGS := -Werror

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include



LOCAL_MODULE := libminui



LOCAL_CLANG := true



# This used to compare against values in double-quotes (which are just

# ordinary characters in this context).  Strip double-quotes from the

# value so that either will work.
@@ -43,9 +59,10 @@ include $(BUILD_STATIC_LIBRARY) 


# Used by OEMs for factory test images.

include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_MODULE := libminui

LOCAL_WHOLE_STATIC_LIBRARIES += libminui

LOCAL_SHARED_LIBRARIES := libpng

LOCAL_CFLAGS := -Werror

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

include $(BUILD_SHARED_LIBRARY)

minui/events.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#include <linux/input.h>



#include "minui.h"

#include "minui/minui.h"



#define MAX_DEVICES 16

#define MAX_MISC_FDS 16

minui/graphics.cpp

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
 * limitations under the License.

 */



#include <stdbool.h>

#include "graphics.h"



#include <stdlib.h>

#include <string.h>

#include <unistd.h>
@@ -32,8 +33,7 @@ 
#include <time.h>



#include "font_10x18.h"

#include "minui.h"

#include "graphics.h"

#include "minui/minui.h"



static GRFont* gr_font = NULL;

static minui_backend* gr_backend = NULL;

minui/graphics.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#ifndef _GRAPHICS_H_

#define _GRAPHICS_H_



#include "minui.h"

#include "minui/minui.h"



// TODO: lose the function pointers.

struct minui_backend {