diff options
Diffstat (limited to '9/platforms/android-21/arch-x86_64/usr')
28 files changed, 160 insertions, 145 deletions
diff --git a/9/platforms/android-21/arch-x86_64/usr/include/android/api-level.h b/9/platforms/android-21/arch-x86_64/usr/include/android/api-level.h index 9e9c3d6..649efd6 100644 --- a/9/platforms/android-21/arch-x86_64/usr/include/android/api-level.h +++ b/9/platforms/android-21/arch-x86_64/usr/include/android/api-level.h @@ -28,6 +28,6 @@ #ifndef ANDROID_API_LEVEL_H #define ANDROID_API_LEVEL_H -#define __ANDROID_API__ 19 +#define __ANDROID_API__ 21 #endif /* ANDROID_API_LEVEL_H */ diff --git a/9/platforms/android-21/arch-x86_64/usr/include/linux/input.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/input.h index df3200c..b9d5b2a 100644 --- a/9/platforms/android-21/arch-x86_64/usr/include/linux/input.h +++ b/9/platforms/android-21/arch-x86_64/usr/include/linux/input.h @@ -97,629 +97,644 @@ struct input_keymap_entry { #define INPUT_PROP_BUTTONPAD 0x02 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define INPUT_PROP_SEMI_MT 0x03 +#define INPUT_PROP_TOPBUTTONPAD 0x04 #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) -#define EV_SYN 0x00 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define EV_SYN 0x00 #define EV_KEY 0x01 #define EV_REL 0x02 #define EV_ABS 0x03 -#define EV_MSC 0x04 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define EV_MSC 0x04 #define EV_SW 0x05 #define EV_LED 0x11 #define EV_SND 0x12 -#define EV_REP 0x14 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define EV_REP 0x14 #define EV_FF 0x15 #define EV_PWR 0x16 #define EV_FF_STATUS 0x17 -#define EV_MAX 0x1f /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define EV_MAX 0x1f #define EV_CNT (EV_MAX+1) #define SYN_REPORT 0 #define SYN_CONFIG 1 -#define SYN_MT_REPORT 2 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define SYN_MT_REPORT 2 #define SYN_DROPPED 3 #define SYN_MAX 0xf #define SYN_CNT (SYN_MAX+1) -#define KEY_RESERVED 0 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_RESERVED 0 #define KEY_ESC 1 #define KEY_1 2 #define KEY_2 3 -#define KEY_3 4 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_3 4 #define KEY_4 5 #define KEY_5 6 #define KEY_6 7 -#define KEY_7 8 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_7 8 #define KEY_8 9 #define KEY_9 10 #define KEY_0 11 -#define KEY_MINUS 12 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_MINUS 12 #define KEY_EQUAL 13 #define KEY_BACKSPACE 14 #define KEY_TAB 15 -#define KEY_Q 16 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_Q 16 #define KEY_W 17 #define KEY_E 18 #define KEY_R 19 -#define KEY_T 20 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_T 20 #define KEY_Y 21 #define KEY_U 22 #define KEY_I 23 -#define KEY_O 24 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_O 24 #define KEY_P 25 #define KEY_LEFTBRACE 26 #define KEY_RIGHTBRACE 27 -#define KEY_ENTER 28 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_ENTER 28 #define KEY_LEFTCTRL 29 #define KEY_A 30 #define KEY_S 31 -#define KEY_D 32 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_D 32 #define KEY_F 33 #define KEY_G 34 #define KEY_H 35 -#define KEY_J 36 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_J 36 #define KEY_K 37 #define KEY_L 38 #define KEY_SEMICOLON 39 -#define KEY_APOSTROPHE 40 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_APOSTROPHE 40 #define KEY_GRAVE 41 #define KEY_LEFTSHIFT 42 #define KEY_BACKSLASH 43 -#define KEY_Z 44 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_Z 44 #define KEY_X 45 #define KEY_C 46 #define KEY_V 47 -#define KEY_B 48 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_B 48 #define KEY_N 49 #define KEY_M 50 #define KEY_COMMA 51 -#define KEY_DOT 52 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_DOT 52 #define KEY_SLASH 53 #define KEY_RIGHTSHIFT 54 #define KEY_KPASTERISK 55 -#define KEY_LEFTALT 56 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_LEFTALT 56 #define KEY_SPACE 57 #define KEY_CAPSLOCK 58 #define KEY_F1 59 -#define KEY_F2 60 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_F2 60 #define KEY_F3 61 #define KEY_F4 62 #define KEY_F5 63 -#define KEY_F6 64 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_F6 64 #define KEY_F7 65 #define KEY_F8 66 #define KEY_F9 67 -#define KEY_F10 68 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_F10 68 #define KEY_NUMLOCK 69 #define KEY_SCROLLLOCK 70 #define KEY_KP7 71 -#define KEY_KP8 72 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_KP8 72 #define KEY_KP9 73 #define KEY_KPMINUS 74 #define KEY_KP4 75 -#define KEY_KP5 76 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_KP5 76 #define KEY_KP6 77 #define KEY_KPPLUS 78 #define KEY_KP1 79 -#define KEY_KP2 80 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_KP2 80 #define KEY_KP3 81 #define KEY_KP0 82 #define KEY_KPDOT 83 -#define KEY_ZENKAKUHANKAKU 85 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_ZENKAKUHANKAKU 85 #define KEY_102ND 86 #define KEY_F11 87 #define KEY_F12 88 -#define KEY_RO 89 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_RO 89 #define KEY_KATAKANA 90 #define KEY_HIRAGANA 91 #define KEY_HENKAN 92 -#define KEY_KATAKANAHIRAGANA 93 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_KATAKANAHIRAGANA 93 #define KEY_MUHENKAN 94 #define KEY_KPJPCOMMA 95 #define KEY_KPENTER 96 -#define KEY_RIGHTCTRL 97 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_RIGHTCTRL 97 #define KEY_KPSLASH 98 #define KEY_SYSRQ 99 #define KEY_RIGHTALT 100 -#define KEY_LINEFEED 101 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_LINEFEED 101 #define KEY_HOME 102 #define KEY_UP 103 #define KEY_PAGEUP 104 -#define KEY_LEFT 105 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_LEFT 105 #define KEY_RIGHT 106 #define KEY_END 107 #define KEY_DOWN 108 -#define KEY_PAGEDOWN 109 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_PAGEDOWN 109 #define KEY_INSERT 110 #define KEY_DELETE 111 #define KEY_MACRO 112 -#define KEY_MUTE 113 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_MUTE 113 #define KEY_VOLUMEDOWN 114 #define KEY_VOLUMEUP 115 #define KEY_POWER 116 -#define KEY_KPEQUAL 117 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_KPEQUAL 117 #define KEY_KPPLUSMINUS 118 #define KEY_PAUSE 119 #define KEY_SCALE 120 -#define KEY_KPCOMMA 121 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_KPCOMMA 121 #define KEY_HANGEUL 122 #define KEY_HANGUEL KEY_HANGEUL #define KEY_HANJA 123 -#define KEY_YEN 124 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_YEN 124 #define KEY_LEFTMETA 125 #define KEY_RIGHTMETA 126 #define KEY_COMPOSE 127 -#define KEY_STOP 128 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_STOP 128 #define KEY_AGAIN 129 #define KEY_PROPS 130 #define KEY_UNDO 131 -#define KEY_FRONT 132 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_FRONT 132 #define KEY_COPY 133 #define KEY_OPEN 134 #define KEY_PASTE 135 -#define KEY_FIND 136 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_FIND 136 #define KEY_CUT 137 #define KEY_HELP 138 #define KEY_MENU 139 -#define KEY_CALC 140 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_CALC 140 #define KEY_SETUP 141 #define KEY_SLEEP 142 #define KEY_WAKEUP 143 -#define KEY_FILE 144 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_FILE 144 #define KEY_SENDFILE 145 #define KEY_DELETEFILE 146 #define KEY_XFER 147 -#define KEY_PROG1 148 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_PROG1 148 #define KEY_PROG2 149 #define KEY_WWW 150 #define KEY_MSDOS 151 -#define KEY_COFFEE 152 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_COFFEE 152 #define KEY_SCREENLOCK KEY_COFFEE #define KEY_DIRECTION 153 #define KEY_CYCLEWINDOWS 154 -#define KEY_MAIL 155 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_MAIL 155 #define KEY_BOOKMARKS 156 #define KEY_COMPUTER 157 #define KEY_BACK 158 -#define KEY_FORWARD 159 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_FORWARD 159 #define KEY_CLOSECD 160 #define KEY_EJECTCD 161 #define KEY_EJECTCLOSECD 162 -#define KEY_NEXTSONG 163 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_NEXTSONG 163 #define KEY_PLAYPAUSE 164 #define KEY_PREVIOUSSONG 165 #define KEY_STOPCD 166 -#define KEY_RECORD 167 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_RECORD 167 #define KEY_REWIND 168 #define KEY_PHONE 169 #define KEY_ISO 170 -#define KEY_CONFIG 171 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_CONFIG 171 #define KEY_HOMEPAGE 172 #define KEY_REFRESH 173 #define KEY_EXIT 174 -#define KEY_MOVE 175 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_MOVE 175 #define KEY_EDIT 176 #define KEY_SCROLLUP 177 #define KEY_SCROLLDOWN 178 -#define KEY_KPLEFTPAREN 179 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_KPLEFTPAREN 179 #define KEY_KPRIGHTPAREN 180 #define KEY_NEW 181 #define KEY_REDO 182 -#define KEY_F13 183 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_F13 183 #define KEY_F14 184 #define KEY_F15 185 #define KEY_F16 186 -#define KEY_F17 187 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_F17 187 #define KEY_F18 188 #define KEY_F19 189 #define KEY_F20 190 -#define KEY_F21 191 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_F21 191 #define KEY_F22 192 #define KEY_F23 193 #define KEY_F24 194 -#define KEY_PLAYCD 200 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_PLAYCD 200 #define KEY_PAUSECD 201 #define KEY_PROG3 202 #define KEY_PROG4 203 -#define KEY_DASHBOARD 204 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_DASHBOARD 204 #define KEY_SUSPEND 205 #define KEY_CLOSE 206 #define KEY_PLAY 207 -#define KEY_FASTFORWARD 208 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_FASTFORWARD 208 #define KEY_BASSBOOST 209 #define KEY_PRINT 210 #define KEY_HP 211 -#define KEY_CAMERA 212 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_CAMERA 212 #define KEY_SOUND 213 #define KEY_QUESTION 214 #define KEY_EMAIL 215 -#define KEY_CHAT 216 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_CHAT 216 #define KEY_SEARCH 217 #define KEY_CONNECT 218 #define KEY_FINANCE 219 -#define KEY_SPORT 220 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_SPORT 220 #define KEY_SHOP 221 #define KEY_ALTERASE 222 #define KEY_CANCEL 223 -#define KEY_BRIGHTNESSDOWN 224 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_BRIGHTNESSDOWN 224 #define KEY_BRIGHTNESSUP 225 #define KEY_MEDIA 226 #define KEY_SWITCHVIDEOMODE 227 -#define KEY_KBDILLUMTOGGLE 228 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_KBDILLUMTOGGLE 228 #define KEY_KBDILLUMDOWN 229 #define KEY_KBDILLUMUP 230 #define KEY_SEND 231 -#define KEY_REPLY 232 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_REPLY 232 #define KEY_FORWARDMAIL 233 #define KEY_SAVE 234 #define KEY_DOCUMENTS 235 -#define KEY_BATTERY 236 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_BATTERY 236 #define KEY_BLUETOOTH 237 #define KEY_WLAN 238 #define KEY_UWB 239 -#define KEY_UNKNOWN 240 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_UNKNOWN 240 #define KEY_VIDEO_NEXT 241 #define KEY_VIDEO_PREV 242 #define KEY_BRIGHTNESS_CYCLE 243 -#define KEY_BRIGHTNESS_ZERO 244 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_BRIGHTNESS_AUTO 244 +#define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO #define KEY_DISPLAY_OFF 245 #define KEY_WWAN 246 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_WIMAX KEY_WWAN #define KEY_RFKILL 247 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_MICMUTE 248 #define BTN_MISC 0x100 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_0 0x100 #define BTN_1 0x101 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_2 0x102 #define BTN_3 0x103 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_4 0x104 #define BTN_5 0x105 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_6 0x106 #define BTN_7 0x107 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_8 0x108 #define BTN_9 0x109 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_MOUSE 0x110 #define BTN_LEFT 0x110 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_RIGHT 0x111 #define BTN_MIDDLE 0x112 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_SIDE 0x113 #define BTN_EXTRA 0x114 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_FORWARD 0x115 #define BTN_BACK 0x116 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TASK 0x117 #define BTN_JOYSTICK 0x120 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TRIGGER 0x120 #define BTN_THUMB 0x121 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_THUMB2 0x122 #define BTN_TOP 0x123 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TOP2 0x124 #define BTN_PINKIE 0x125 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_BASE 0x126 #define BTN_BASE2 0x127 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_BASE3 0x128 #define BTN_BASE4 0x129 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_BASE5 0x12a #define BTN_BASE6 0x12b +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_DEAD 0x12f #define BTN_GAMEPAD 0x130 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_SOUTH 0x130 #define BTN_A BTN_SOUTH +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_EAST 0x131 #define BTN_B BTN_EAST -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_C 0x132 #define BTN_NORTH 0x133 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_X BTN_NORTH #define BTN_WEST 0x134 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_Y BTN_WEST #define BTN_Z 0x135 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TL 0x136 #define BTN_TR 0x137 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TL2 0x138 #define BTN_TR2 0x139 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_SELECT 0x13a #define BTN_START 0x13b -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_MODE 0x13c #define BTN_THUMBL 0x13d +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_THUMBR 0x13e #define BTN_DIGI 0x140 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TOOL_PEN 0x140 #define BTN_TOOL_RUBBER 0x141 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TOOL_BRUSH 0x142 #define BTN_TOOL_PENCIL 0x143 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TOOL_AIRBRUSH 0x144 #define BTN_TOOL_FINGER 0x145 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TOOL_MOUSE 0x146 #define BTN_TOOL_LENS 0x147 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TOOL_QUINTTAP 0x148 #define BTN_TOUCH 0x14a +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_STYLUS 0x14b #define BTN_STYLUS2 0x14c -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TOOL_DOUBLETAP 0x14d #define BTN_TOOL_TRIPLETAP 0x14e +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TOOL_QUADTAP 0x14f #define BTN_WHEEL 0x150 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_GEAR_DOWN 0x150 #define BTN_GEAR_UP 0x151 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_OK 0x160 #define KEY_SELECT 0x161 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_GOTO 0x162 #define KEY_CLEAR 0x163 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_POWER2 0x164 #define KEY_OPTION 0x165 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_INFO 0x166 #define KEY_TIME 0x167 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_VENDOR 0x168 #define KEY_ARCHIVE 0x169 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_PROGRAM 0x16a #define KEY_CHANNEL 0x16b +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FAVORITES 0x16c #define KEY_EPG 0x16d -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_PVR 0x16e #define KEY_MHP 0x16f +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_LANGUAGE 0x170 #define KEY_TITLE 0x171 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_SUBTITLE 0x172 #define KEY_ANGLE 0x173 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_ZOOM 0x174 #define KEY_MODE 0x175 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_KEYBOARD 0x176 #define KEY_SCREEN 0x177 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_PC 0x178 #define KEY_TV 0x179 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_TV2 0x17a #define KEY_VCR 0x17b +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_VCR2 0x17c #define KEY_SAT 0x17d -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_SAT2 0x17e #define KEY_CD 0x17f +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_TAPE 0x180 #define KEY_RADIO 0x181 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_TUNER 0x182 #define KEY_PLAYER 0x183 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_TEXT 0x184 #define KEY_DVD 0x185 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_AUX 0x186 #define KEY_MP3 0x187 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_AUDIO 0x188 #define KEY_VIDEO 0x189 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_DIRECTORY 0x18a #define KEY_LIST 0x18b +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_MEMO 0x18c #define KEY_CALENDAR 0x18d -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_RED 0x18e #define KEY_GREEN 0x18f +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_YELLOW 0x190 #define KEY_BLUE 0x191 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_CHANNELUP 0x192 #define KEY_CHANNELDOWN 0x193 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FIRST 0x194 #define KEY_LAST 0x195 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_AB 0x196 #define KEY_NEXT 0x197 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_RESTART 0x198 #define KEY_SLOW 0x199 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_SHUFFLE 0x19a #define KEY_BREAK 0x19b +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_PREVIOUS 0x19c #define KEY_DIGITS 0x19d -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_TEEN 0x19e #define KEY_TWEN 0x19f +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_VIDEOPHONE 0x1a0 #define KEY_GAMES 0x1a1 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_ZOOMIN 0x1a2 #define KEY_ZOOMOUT 0x1a3 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_ZOOMRESET 0x1a4 #define KEY_WORDPROCESSOR 0x1a5 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_EDITOR 0x1a6 #define KEY_SPREADSHEET 0x1a7 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_GRAPHICSEDITOR 0x1a8 #define KEY_PRESENTATION 0x1a9 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_DATABASE 0x1aa #define KEY_NEWS 0x1ab +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_VOICEMAIL 0x1ac #define KEY_ADDRESSBOOK 0x1ad -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_MESSENGER 0x1ae #define KEY_DISPLAYTOGGLE 0x1af +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE #define KEY_SPELLCHECK 0x1b0 #define KEY_LOGOFF 0x1b1 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_DOLLAR 0x1b2 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_EURO 0x1b3 #define KEY_FRAMEBACK 0x1b4 #define KEY_FRAMEFORWARD 0x1b5 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_CONTEXT_MENU 0x1b6 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_MEDIA_REPEAT 0x1b7 #define KEY_10CHANNELSUP 0x1b8 #define KEY_10CHANNELSDOWN 0x1b9 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_IMAGES 0x1ba +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 #define KEY_INS_LINE 0x1c2 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_DEL_LINE 0x1c3 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN 0x1d0 #define KEY_FN_ESC 0x1d1 #define KEY_FN_F1 0x1d2 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN_F2 0x1d3 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN_F3 0x1d4 #define KEY_FN_F4 0x1d5 #define KEY_FN_F5 0x1d6 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN_F6 0x1d7 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN_F7 0x1d8 #define KEY_FN_F8 0x1d9 #define KEY_FN_F9 0x1da -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN_F10 0x1db +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN_F11 0x1dc #define KEY_FN_F12 0x1dd #define KEY_FN_1 0x1de -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN_2 0x1df +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN_D 0x1e0 #define KEY_FN_E 0x1e1 #define KEY_FN_F 0x1e2 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN_S 0x1e3 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_FN_B 0x1e4 #define KEY_BRL_DOT1 0x1f1 #define KEY_BRL_DOT2 0x1f2 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_BRL_DOT3 0x1f3 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_BRL_DOT4 0x1f4 #define KEY_BRL_DOT5 0x1f5 #define KEY_BRL_DOT6 0x1f6 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_BRL_DOT7 0x1f7 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_BRL_DOT8 0x1f8 #define KEY_BRL_DOT9 0x1f9 #define KEY_BRL_DOT10 0x1fa -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_NUMERIC_0 0x200 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_NUMERIC_1 0x201 #define KEY_NUMERIC_2 0x202 #define KEY_NUMERIC_3 0x203 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_NUMERIC_4 0x204 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_NUMERIC_5 0x205 #define KEY_NUMERIC_6 0x206 #define KEY_NUMERIC_7 0x207 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_NUMERIC_8 0x208 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_NUMERIC_9 0x209 #define KEY_NUMERIC_STAR 0x20a #define KEY_NUMERIC_POUND 0x20b -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_CAMERA_FOCUS 0x210 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_WPS_BUTTON 0x211 #define KEY_TOUCHPAD_TOGGLE 0x212 #define KEY_TOUCHPAD_ON 0x213 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_TOUCHPAD_OFF 0x214 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_CAMERA_ZOOMIN 0x215 #define KEY_CAMERA_ZOOMOUT 0x216 #define KEY_CAMERA_UP 0x217 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_CAMERA_DOWN 0x218 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_CAMERA_LEFT 0x219 #define KEY_CAMERA_RIGHT 0x21a #define KEY_ATTENDANT_ON 0x21b -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_ATTENDANT_OFF 0x21c +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define KEY_ATTENDANT_TOGGLE 0x21d #define KEY_LIGHTS_TOGGLE 0x21e #define BTN_DPAD_UP 0x220 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_DPAD_DOWN 0x221 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_DPAD_LEFT 0x222 #define BTN_DPAD_RIGHT 0x223 #define KEY_ALS_TOGGLE 0x230 +#define KEY_BUTTONCONFIG 0x240 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_TASKMANAGER 0x241 +#define KEY_JOURNAL 0x242 +#define KEY_CONTROLPANEL 0x243 +#define KEY_APPSELECT 0x244 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define KEY_SCREENSAVER 0x245 +#define KEY_VOICECOMMAND 0x246 +#define KEY_BRIGHTNESS_MIN 0x250 +#define KEY_BRIGHTNESS_MAX 0x251 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 diff --git a/9/platforms/android-21/arch-x86_64/usr/include/malloc.h b/9/platforms/android-21/arch-x86_64/usr/include/malloc.h index 1e92b7d..e6ea276 100644 --- a/9/platforms/android-21/arch-x86_64/usr/include/malloc.h +++ b/9/platforms/android-21/arch-x86_64/usr/include/malloc.h @@ -27,19 +27,12 @@ __BEGIN_DECLS -#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ < 5) extern void* malloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1))); extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur __attribute__((alloc_size(1,2))); extern void* realloc(void* p, size_t byte_count) __wur __attribute__((alloc_size(2))); -extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2))); -#else -extern void* malloc(size_t byte_count) __mallocfunc __wur; -extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur; -extern void* realloc(void* p, size_t byte_count) __wur; -extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur; -#endif - extern void free(void* p); + +extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2))); extern size_t malloc_usable_size(const void* p); #ifndef STRUCT_MALLINFO_DECLARED diff --git a/9/platforms/android-21/arch-x86_64/usr/include/math.h b/9/platforms/android-21/arch-x86_64/usr/include/math.h index 8369d6e..e872388 100644 --- a/9/platforms/android-21/arch-x86_64/usr/include/math.h +++ b/9/platforms/android-21/arch-x86_64/usr/include/math.h @@ -512,7 +512,8 @@ double __builtin_expm1(double) __NDK_FPABI_MATH__; double __builtin_fma(double, double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; -#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6) +#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7) +/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */ int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; #else diff --git a/9/platforms/android-21/arch-x86_64/usr/include/signal.h b/9/platforms/android-21/arch-x86_64/usr/include/signal.h index f1849c5..e23e65b 100644 --- a/9/platforms/android-21/arch-x86_64/usr/include/signal.h +++ b/9/platforms/android-21/arch-x86_64/usr/include/signal.h @@ -48,6 +48,9 @@ # include <linux/signal.h> #endif +#include <sys/ucontext.h> +#define __BIONIC_HAVE_UCONTEXT_T + __BEGIN_DECLS typedef int sig_atomic_t; diff --git a/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h b/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h index 3db25a7..bcea859 100644 --- a/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h @@ -89,6 +89,7 @@ using std::atomic_signal_fence; using std::memory_order; using std::memory_order_relaxed; using std::memory_order_consume; +using std::memory_order_acquire; using std::memory_order_release; using std::memory_order_acq_rel; using std::memory_order_seq_cst; diff --git a/9/platforms/android-21/arch-x86_64/usr/include/sys/ucontext.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/ucontext.h index f62380d..dd2a0bb 100644 --- a/9/platforms/android-21/arch-x86_64/usr/include/sys/ucontext.h +++ b/9/platforms/android-21/arch-x86_64/usr/include/sys/ucontext.h @@ -68,11 +68,9 @@ typedef struct ucontext { struct ucontext* uc_link; stack_t uc_stack; mcontext_t uc_mcontext; + sigset_t uc_sigmask; // Android has a wrong (smaller) sigset_t on ARM. - union { - sigset_t bionic; - uint32_t kernel[2]; - } uc_sigmask; + uint32_t __padding_rt_sigset; // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM. char __padding[120]; unsigned long uc_regspace[128] __attribute__((__aligned__(8))); @@ -80,6 +78,10 @@ typedef struct ucontext { #elif defined(__aarch64__) +#define NGREG 34 /* x0..x30 + sp + pc + pstate */ +typedef unsigned long greg_t; +typedef greg_t gregset_t[NGREG]; + #include <asm/sigcontext.h> typedef struct sigcontext mcontext_t; @@ -152,11 +154,9 @@ typedef struct ucontext { struct ucontext* uc_link; stack_t uc_stack; mcontext_t uc_mcontext; + sigset_t uc_sigmask; // Android has a wrong (smaller) sigset_t on x86. - union { - sigset_t bionic; - uint32_t kernel[2]; - } uc_sigmask; + uint32_t __padding_rt_sigset; struct _libc_fpstate __fpregs_mem; } ucontext_t; diff --git a/9/platforms/android-21/arch-x86_64/usr/include/time.h b/9/platforms/android-21/arch-x86_64/usr/include/time.h index 0a5f18b..aa72fcc 100644 --- a/9/platforms/android-21/arch-x86_64/usr/include/time.h +++ b/9/platforms/android-21/arch-x86_64/usr/include/time.h @@ -85,8 +85,10 @@ extern void tzset(void) __LIBC_ABI_PUBLIC__; extern clock_t clock(void) __LIBC_ABI_PUBLIC__; -extern int clock_getres(int, struct timespec*) __LIBC_ABI_PUBLIC__; -extern int clock_gettime(int, struct timespec*) __LIBC_ABI_PUBLIC__; +extern int clock_getres(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__; +extern int clock_gettime(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__; +extern int clock_nanosleep(clockid_t, int, const struct timespec*, struct timespec*) __LIBC_ABI_PUBLIC__; +extern int clock_settime(clockid_t, const struct timespec*) __LIBC_ABI_PUBLIC__; extern int timer_create(int, struct sigevent*, timer_t*) __LIBC_ABI_PUBLIC__; extern int timer_delete(timer_t) __LIBC_ABI_PUBLIC__; diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_dynamic.o b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_dynamic.o Binary files differindex 8b98275..cbec8c9 100644 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_dynamic.o +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_dynamic.o diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_so.o b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_so.o Binary files differindex 3772320..728703f 100644 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_so.o +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_so.o diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_static.o b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_static.o Binary files differindex 8b98275..cbec8c9 100644 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_static.o +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_static.o diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libEGL.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libEGL.so Binary files differindex e082dc3..aba9ec3 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libEGL.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libEGL.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv1_CM.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv1_CM.so Binary files differindex 46ed256..ce0af7f 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv1_CM.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv1_CM.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv2.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv2.so Binary files differindex a68e4b5..8f4ad33 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv2.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv2.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv3.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv3.so Binary files differindex fa10b53..3fc5fb6 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv3.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv3.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenMAXAL.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenMAXAL.so Binary files differindex c2cd543..39473cf 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenMAXAL.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenMAXAL.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenSLES.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenSLES.so Binary files differindex ae3f67e..2ea32f8 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenSLES.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenSLES.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libandroid.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libandroid.so Binary files differindex 9dd350a..ff64d42 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libandroid.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libandroid.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libdl.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libdl.so Binary files differindex 3b5b4fb..9f1c362 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libdl.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libdl.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libjnigraphics.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libjnigraphics.so Binary files differindex 1d35f70..29a632a 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libjnigraphics.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libjnigraphics.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/liblog.so b/9/platforms/android-21/arch-x86_64/usr/lib64/liblog.so Binary files differindex 98699bb..5c480eb 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/liblog.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/liblog.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libm.a b/9/platforms/android-21/arch-x86_64/usr/lib64/libm.a Binary files differindex 771b524..991cc05 100644 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libm.a +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libm.a diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libm.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libm.so Binary files differindex 2a689ad..c04933d 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libm.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libm.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libmediandk.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libmediandk.so Binary files differindex 1dd4550..b9da256 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libmediandk.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libmediandk.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.a b/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.a Binary files differindex 92d47c8..18a78a4 100644 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.a +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.a diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.so Binary files differindex a9c373b..cec8fa5 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.so diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libz.a b/9/platforms/android-21/arch-x86_64/usr/lib64/libz.a Binary files differindex 7e5b8c2..ca200a4 100644 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libz.a +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libz.a diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libz.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libz.so Binary files differindex 0d6f0b3..5fc97f3 100755 --- a/9/platforms/android-21/arch-x86_64/usr/lib64/libz.so +++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libz.so |