diff options
Diffstat (limited to 'minui')
| -rw-r--r-- | minui/Android.mk | 31 | ||||
| -rw-r--r-- | minui/events.cpp | 2 | ||||
| -rw-r--r-- | minui/graphics.cpp | 6 | ||||
| -rw-r--r-- | minui/graphics.h | 2 | ||||
| -rw-r--r-- | minui/graphics_drm.cpp | 3 | ||||
| -rw-r--r-- | minui/graphics_fbdev.cpp | 3 | ||||
| -rw-r--r-- | minui/include/minui/minui.h (renamed from minui/minui.h) | 0 | ||||
| -rw-r--r-- | minui/resources.cpp | 2 |
8 files changed, 32 insertions, 17 deletions
diff --git a/minui/Android.mk b/minui/Android.mk index 67b81fc6d..281f64912 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -1,3 +1,17 @@ +# 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) diff --git a/minui/events.cpp b/minui/events.cpp index e6e7bd28c..237af1ca5 100644 --- a/minui/events.cpp +++ b/minui/events.cpp @@ -25,7 +25,7 @@ #include <linux/input.h> -#include "minui.h" +#include "minui/minui.h" #define MAX_DEVICES 16 #define MAX_MISC_FDS 16 diff --git a/minui/graphics.cpp b/minui/graphics.cpp index a3a958819..3b3bb65b5 100644 --- a/minui/graphics.cpp +++ b/minui/graphics.cpp @@ -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; diff --git a/minui/graphics.h b/minui/graphics.h index 52968eb10..1eaafc75a 100644 --- a/minui/graphics.h +++ b/minui/graphics.h @@ -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 { diff --git a/minui/graphics_drm.cpp b/minui/graphics_drm.cpp index 03e33b775..199f4d83c 100644 --- a/minui/graphics_drm.cpp +++ b/minui/graphics_drm.cpp @@ -16,7 +16,6 @@ #include <drm_fourcc.h> #include <fcntl.h> -#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -28,7 +27,7 @@ #include <xf86drm.h> #include <xf86drmMode.h> -#include "minui.h" +#include "minui/minui.h" #include "graphics.h" #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*(A))) diff --git a/minui/graphics_fbdev.cpp b/minui/graphics_fbdev.cpp index 631ef4e13..2d70249ed 100644 --- a/minui/graphics_fbdev.cpp +++ b/minui/graphics_fbdev.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include <stdbool.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -30,7 +29,7 @@ #include <linux/fb.h> #include <linux/kd.h> -#include "minui.h" +#include "minui/minui.h" #include "graphics.h" static GRSurface* fbdev_init(minui_backend*); diff --git a/minui/minui.h b/minui/include/minui/minui.h index 78890b84b..78890b84b 100644 --- a/minui/minui.h +++ b/minui/include/minui/minui.h diff --git a/minui/resources.cpp b/minui/resources.cpp index 9ccbf4b1b..e6909f269 100644 --- a/minui/resources.cpp +++ b/minui/resources.cpp @@ -31,7 +31,7 @@ #include <vector> #include <png.h> -#include "minui.h" +#include "minui/minui.h" #define SURFACE_DATA_ALIGNMENT 8 |