diff options
author | Tao Bao | 2017-01-16 23:16:58 -0600 |
---|---|---|
committer | Tao Bao | 2017-01-16 23:28:18 -0600 |
commit | 0ecbd76b220ba6f3d02fa028b9c6481f7fb5c089 (patch) | |
tree | 9f8c0d4ad683e77dcbb0f3e6a14970462b9b4ba5 | |
parent | ebb4e96a716824d54be9469b7a638ad4b15ca224 (diff) | |
download | platform-bootable-recovery-0ecbd76b220ba6f3d02fa028b9c6481f7fb5c089.tar.gz platform-bootable-recovery-0ecbd76b220ba6f3d02fa028b9c6481f7fb5c089.tar.xz platform-bootable-recovery-0ecbd76b220ba6f3d02fa028b9c6481f7fb5c089.zip |
minui: Export minui/minui.h.
For libminui static and shared libraries.
Test: build
Change-Id: Ib30dc5e2ef4a3c8b3ca3a0cec68cb65e229a0c16
-rw-r--r-- | Android.mk | 6 | ||||
-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 | ||||
-rw-r--r-- | screen_ui.h | 4 | ||||
-rw-r--r-- | wear_ui.cpp | 8 |
11 files changed, 45 insertions, 22 deletions
@@ -151,7 +151,11 @@ LOCAL_SRC_FILES := \ | |||
151 | asn1_decoder.cpp \ | 151 | asn1_decoder.cpp \ |
152 | verifier.cpp \ | 152 | verifier.cpp \ |
153 | ui.cpp | 153 | ui.cpp |
154 | LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase | 154 | LOCAL_STATIC_LIBRARIES := \ |
155 | libminui \ | ||
156 | libcrypto_utils \ | ||
157 | libcrypto \ | ||
158 | libbase | ||
155 | LOCAL_CFLAGS := -Werror | 159 | LOCAL_CFLAGS := -Werror |
156 | include $(BUILD_STATIC_LIBRARY) | 160 | include $(BUILD_STATIC_LIBRARY) |
157 | 161 | ||
diff --git a/minui/Android.mk b/minui/Android.mk index 67b81fc6..281f6491 100644 --- a/minui/Android.mk +++ b/minui/Android.mk | |||
@@ -1,3 +1,17 @@ | |||
1 | # Copyright (C) 2007 The Android Open Source Project | ||
2 | # | ||
3 | # Licensed under the Apache License, Version 2.0 (the "License"); | ||
4 | # you may not use this file except in compliance with the License. | ||
5 | # You may obtain a copy of the License at | ||
6 | # | ||
7 | # http://www.apache.org/licenses/LICENSE-2.0 | ||
8 | # | ||
9 | # Unless required by applicable law or agreed to in writing, software | ||
10 | # distributed under the License is distributed on an "AS IS" BASIS, | ||
11 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
12 | # See the License for the specific language governing permissions and | ||
13 | # limitations under the License. | ||
14 | |||
1 | LOCAL_PATH := $(call my-dir) | 15 | LOCAL_PATH := $(call my-dir) |
2 | include $(CLEAR_VARS) | 16 | include $(CLEAR_VARS) |
3 | 17 | ||
@@ -9,16 +23,18 @@ LOCAL_SRC_FILES := \ | |||
9 | graphics_fbdev.cpp \ | 23 | graphics_fbdev.cpp \ |
10 | resources.cpp \ | 24 | resources.cpp \ |
11 | 25 | ||
12 | LOCAL_WHOLE_STATIC_LIBRARIES += libadf | 26 | LOCAL_WHOLE_STATIC_LIBRARIES := \ |
13 | LOCAL_WHOLE_STATIC_LIBRARIES += libdrm | 27 | libadf \ |
14 | LOCAL_WHOLE_STATIC_LIBRARIES += libsync_recovery | 28 | libdrm \ |
15 | LOCAL_STATIC_LIBRARIES += libpng | 29 | libsync_recovery |
30 | |||
31 | LOCAL_STATIC_LIBRARIES := libpng | ||
16 | LOCAL_CFLAGS := -Werror | 32 | LOCAL_CFLAGS := -Werror |
33 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include | ||
34 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | ||
17 | 35 | ||
18 | LOCAL_MODULE := libminui | 36 | LOCAL_MODULE := libminui |
19 | 37 | ||
20 | LOCAL_CLANG := true | ||
21 | |||
22 | # This used to compare against values in double-quotes (which are just | 38 | # This used to compare against values in double-quotes (which are just |
23 | # ordinary characters in this context). Strip double-quotes from the | 39 | # ordinary characters in this context). Strip double-quotes from the |
24 | # value so that either will work. | 40 | # value so that either will work. |
@@ -43,9 +59,10 @@ include $(BUILD_STATIC_LIBRARY) | |||
43 | 59 | ||
44 | # Used by OEMs for factory test images. | 60 | # Used by OEMs for factory test images. |
45 | include $(CLEAR_VARS) | 61 | include $(CLEAR_VARS) |
46 | LOCAL_CLANG := true | ||
47 | LOCAL_MODULE := libminui | 62 | LOCAL_MODULE := libminui |
48 | LOCAL_WHOLE_STATIC_LIBRARIES += libminui | 63 | LOCAL_WHOLE_STATIC_LIBRARIES += libminui |
49 | LOCAL_SHARED_LIBRARIES := libpng | 64 | LOCAL_SHARED_LIBRARIES := libpng |
50 | LOCAL_CFLAGS := -Werror | 65 | LOCAL_CFLAGS := -Werror |
66 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include | ||
67 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | ||
51 | include $(BUILD_SHARED_LIBRARY) | 68 | include $(BUILD_SHARED_LIBRARY) |
diff --git a/minui/events.cpp b/minui/events.cpp index e6e7bd28..237af1ca 100644 --- a/minui/events.cpp +++ b/minui/events.cpp | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #include <linux/input.h> | 26 | #include <linux/input.h> |
27 | 27 | ||
28 | #include "minui.h" | 28 | #include "minui/minui.h" |
29 | 29 | ||
30 | #define MAX_DEVICES 16 | 30 | #define MAX_DEVICES 16 |
31 | #define MAX_MISC_FDS 16 | 31 | #define MAX_MISC_FDS 16 |
diff --git a/minui/graphics.cpp b/minui/graphics.cpp index dcca3ec4..34ea81c7 100644 --- a/minui/graphics.cpp +++ b/minui/graphics.cpp | |||
@@ -14,7 +14,8 @@ | |||
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <stdbool.h> | 17 | #include "graphics.h" |
18 | |||
18 | #include <stdlib.h> | 19 | #include <stdlib.h> |
19 | #include <string.h> | 20 | #include <string.h> |
20 | #include <unistd.h> | 21 | #include <unistd.h> |
@@ -32,8 +33,7 @@ | |||
32 | #include <time.h> | 33 | #include <time.h> |
33 | 34 | ||
34 | #include "font_10x18.h" | 35 | #include "font_10x18.h" |
35 | #include "minui.h" | 36 | #include "minui/minui.h" |
36 | #include "graphics.h" | ||
37 | 37 | ||
38 | static GRFont* gr_font = NULL; | 38 | static GRFont* gr_font = NULL; |
39 | static minui_backend* gr_backend = NULL; | 39 | static minui_backend* gr_backend = NULL; |
diff --git a/minui/graphics.h b/minui/graphics.h index 52968eb1..1eaafc75 100644 --- a/minui/graphics.h +++ b/minui/graphics.h | |||
@@ -17,7 +17,7 @@ | |||
17 | #ifndef _GRAPHICS_H_ | 17 | #ifndef _GRAPHICS_H_ |
18 | #define _GRAPHICS_H_ | 18 | #define _GRAPHICS_H_ |
19 | 19 | ||
20 | #include "minui.h" | 20 | #include "minui/minui.h" |
21 | 21 | ||
22 | // TODO: lose the function pointers. | 22 | // TODO: lose the function pointers. |
23 | struct minui_backend { | 23 | struct minui_backend { |
diff --git a/minui/graphics_drm.cpp b/minui/graphics_drm.cpp index 03e33b77..199f4d83 100644 --- a/minui/graphics_drm.cpp +++ b/minui/graphics_drm.cpp | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #include <drm_fourcc.h> | 17 | #include <drm_fourcc.h> |
18 | #include <fcntl.h> | 18 | #include <fcntl.h> |
19 | #include <stdbool.h> | ||
20 | #include <stdio.h> | 19 | #include <stdio.h> |
21 | #include <stdlib.h> | 20 | #include <stdlib.h> |
22 | #include <string.h> | 21 | #include <string.h> |
@@ -28,7 +27,7 @@ | |||
28 | #include <xf86drm.h> | 27 | #include <xf86drm.h> |
29 | #include <xf86drmMode.h> | 28 | #include <xf86drmMode.h> |
30 | 29 | ||
31 | #include "minui.h" | 30 | #include "minui/minui.h" |
32 | #include "graphics.h" | 31 | #include "graphics.h" |
33 | 32 | ||
34 | #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*(A))) | 33 | #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*(A))) |
diff --git a/minui/graphics_fbdev.cpp b/minui/graphics_fbdev.cpp index 631ef4e1..2d70249e 100644 --- a/minui/graphics_fbdev.cpp +++ b/minui/graphics_fbdev.cpp | |||
@@ -14,7 +14,6 @@ | |||
14 | * limitations under the License. | 14 | * limitations under the License. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <stdbool.h> | ||
18 | #include <stdlib.h> | 17 | #include <stdlib.h> |
19 | #include <string.h> | 18 | #include <string.h> |
20 | #include <unistd.h> | 19 | #include <unistd.h> |
@@ -30,7 +29,7 @@ | |||
30 | #include <linux/fb.h> | 29 | #include <linux/fb.h> |
31 | #include <linux/kd.h> | 30 | #include <linux/kd.h> |
32 | 31 | ||
33 | #include "minui.h" | 32 | #include "minui/minui.h" |
34 | #include "graphics.h" | 33 | #include "graphics.h" |
35 | 34 | ||
36 | static GRSurface* fbdev_init(minui_backend*); | 35 | static GRSurface* fbdev_init(minui_backend*); |
diff --git a/minui/minui.h b/minui/include/minui/minui.h index 78890b84..78890b84 100644 --- a/minui/minui.h +++ b/minui/include/minui/minui.h | |||
diff --git a/minui/resources.cpp b/minui/resources.cpp index 9ccbf4b1..e6909f26 100644 --- a/minui/resources.cpp +++ b/minui/resources.cpp | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <vector> | 31 | #include <vector> |
32 | #include <png.h> | 32 | #include <png.h> |
33 | 33 | ||
34 | #include "minui.h" | 34 | #include "minui/minui.h" |
35 | 35 | ||
36 | #define SURFACE_DATA_ALIGNMENT 8 | 36 | #define SURFACE_DATA_ALIGNMENT 8 |
37 | 37 | ||
diff --git a/screen_ui.h b/screen_ui.h index 3ad64907..b2dcf4ae 100644 --- a/screen_ui.h +++ b/screen_ui.h | |||
@@ -23,7 +23,9 @@ | |||
23 | #include <string> | 23 | #include <string> |
24 | 24 | ||
25 | #include "ui.h" | 25 | #include "ui.h" |
26 | #include "minui/minui.h" | 26 | |
27 | // From minui/minui.h. | ||
28 | struct GRSurface; | ||
27 | 29 | ||
28 | // Implementation of RecoveryUI appropriate for devices with a screen | 30 | // Implementation of RecoveryUI appropriate for devices with a screen |
29 | // (shows an icon + a progress bar, text logging, menu, etc.) | 31 | // (shows an icon + a progress bar, text logging, menu, etc.) |
diff --git a/wear_ui.cpp b/wear_ui.cpp index b4c63a5a..6c028655 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp | |||
@@ -30,11 +30,13 @@ | |||
30 | #include <string> | 30 | #include <string> |
31 | #include <vector> | 31 | #include <vector> |
32 | 32 | ||
33 | #include <android-base/properties.h> | ||
34 | #include <android-base/strings.h> | ||
35 | #include <android-base/stringprintf.h> | ||
36 | #include <minui/minui.h> | ||
37 | |||
33 | #include "common.h" | 38 | #include "common.h" |
34 | #include "device.h" | 39 | #include "device.h" |
35 | #include "android-base/properties.h" | ||
36 | #include "android-base/strings.h" | ||
37 | #include "android-base/stringprintf.h" | ||
38 | 40 | ||
39 | // There's only (at most) one of these objects, and global callbacks | 41 | // There's only (at most) one of these objects, and global callbacks |
40 | // (for pthread_create, and the input event system) need to find it, | 42 | // (for pthread_create, and the input event system) need to find it, |