Commit Graph

13332 Commits

Author SHA1 Message Date
Andrew Hsieh
fa902f3344 Merge "Fix gl3stub.h" 2014-07-17 23:12:27 +00:00
Yohann Roussel
e15f6511b7 Merge "Move multidex support library" 2014-07-17 22:39:21 +00:00
Maurice Chu
6fee567b2f Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

Bug: 10674263

(cherry picked from commit 7b433ee4e4)

Change-Id: If33387af7b58da2f258eba1240a911483daa9c7e
2014-07-18 10:52:54 +00:00
Yohann Roussel
2d2ce1b6c3 Merge "Add res folder to multidex SDK projects." 2014-07-17 22:37:43 +00:00
Yohann Roussel
93b72e4703 Merge "android-support-multidex-instrumentation in SDK." 2014-07-17 22:36:58 +00:00
Yohann Roussel
c854c636d9 Merge "Add multidex ADT project to SDK." 2014-07-17 22:37:43 +00:00
Yohann Roussel
0d1b03f127 Merge "Include android-support-multidex in SDK libs." 2014-07-17 22:36:58 +00:00
Yohann Roussel
b16fd5a5f4 Add res folder to multidex SDK projects.
This will fix an error when importing thoses projects with ADT.

(cherry picked from commit 6fa1156b3b)

Change-Id: Ibcd570a3f4f3bd6c8c4fd263d2d18e2cec18b787
2014-07-17 16:44:30 +02:00
Yohann Roussel
96dc8db6e5 android-support-multidex-instrumentation in SDK.
(cherry picked from commit 6f57b24889)

Change-Id: Ic8e609c0025d86c873161b28d99bb0da2b6c2d27
2014-07-17 16:44:30 +02:00
Yohann Roussel
ef0e4f5a3b Add multidex ADT project to SDK.
(cherry picked from commit a6ca3cf29f)

Change-Id: I44cf397dbc5649d9d701e2f8524a322d74c2aaa6
2014-07-17 16:44:30 +02:00
Yohann Roussel
604bf1f185 Include android-support-multidex in SDK libs.
(cherry picked from commit 9e27887b60)

Change-Id: Ieb2901a633a687927a0c5a5db6d17896c3b86449
2014-07-17 16:44:30 +02:00
Andrew Hsieh
36dea383df Fix gl3stub.h
Only define the following before android-L (where new headers define
them already)

  typedef khronos_int64_t  GLint64;
  typedef khronos_uint64_t GLuint64;
  typedef struct __GLsync *GLsync;

Also define L to 9999 for crtbrand.c which needs it to be an integer

Change-Id: I9ed957d70b85cd1cdfeacf11f77203b39c93023d
2014-07-17 16:32:05 +08:00
Andrew Hsieh
37feee2abc Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap" 2014-07-17 04:11:20 +00:00
Andrew Hsieh
d10a35fe44 Update mipsel and mips64el multilib lib* and lib-bootstrap
Needed by:
  https://android-review.googlesource.com/#/c/101410
  https://android-review.googlesource.com/#/c/101022

Change-Id: Ia5f96fa2ee91984cba12983c9fb01a6b2e584209
2014-07-17 16:24:51 +08:00
Andrew Hsieh
37351fdd10 Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib" 2014-07-17 04:11:20 +00:00
Andrew Hsieh
8b4f4331b7 Remove symlink ndk/platforms/android-L/arch-mips64/lib
This is for coming CL which replaces symlink lib with physical directory.
Somehow android-review.googlesource.com dislikes removal of
symlink and addition of physical directory appear in the same CL

Change-Id: I42a06761d940ef74859bf3bf8f6bb12667863a1e
2014-07-17 16:20:21 +08:00
Andrew Hsieh
488f2392a5 Merge "getSampletime -> getSampleTime" 2014-07-17 04:11:20 +00:00
Marco Nelissen
7a2be752cb getSampletime -> getSampleTime
Change-Id: I089adb8a4050fe72befe272318a903ef93744335
2014-07-17 15:31:43 +08:00
Marco Nelissen
cf8a4a67a5 Media NDK files
Change-Id: Ie41df1949abde194156ab188a662ec7065343d54
2014-07-17 15:31:04 +08:00
Marco Nelissen
ba5926ec3e NDK media codec sample
Change-Id: Id7e70cfccdace8bce253bdac4434c42f52ff72f3
2014-07-17 15:29:09 +08:00
Jesse Hall
22d95914d5 ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
Also update existing GLES2 and GLES3 headers to latest official
Khronos versions.

Bug: 15028495
Change-Id: Iecdc1d2cc23fbe10f225511536fb0bd46d11af4a
2014-07-17 15:20:39 +08:00
Glenn Kasten
5c939bfd32 Update OpenSLES_Android.h for API L
All other include/SLES/*.h are unchanged since API 14

Change-Id: If4be7449fc8866ee630dd7986d3ee0d6a48549d4
2014-07-17 15:13:15 +08:00
Andrew Hsieh
2918193e0b Merge "Media NDK files" 2014-07-17 04:07:19 +00:00
Andrew Hsieh
8092009a49 Merge "NDK media codec sample" 2014-07-17 04:16:20 +00:00
Andrew Hsieh
6fdc279102 Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so" 2014-07-17 04:11:20 +00:00
Andrew Hsieh
8839697e9c Merge "Update OpenSLES_Android.h for API L" 2014-07-17 04:07:19 +00:00
Elliott Hughes
be5e8f728a Merge "Stack tool 32/64 bit compatibility fixes." 2014-07-16 23:44:46 +00:00
Brigid Smith
15142f793a Stack tool 32/64 bit compatibility fixes.
Left the default symbol.ARCH value intact and changed stack_core instead
so that it will assume the ABI is arm until it sees an ABI line.  This
allows compatibility for people who are used to pasting portions of a
tombstone instead of the whole thing (assuming said tombstone is arm)
while additionally supporting other architectures if a whole tombstone
  is pasted in.

Change-Id: Ib8b5754920d2e2aa5017c29daeca59abcf4b547d
2014-07-16 15:56:46 -07:00
Elliott Hughes
535decd2bc Merge "Add the arm64 pstate register to the stack tool." 2014-07-14 23:57:35 +00:00
Elliott Hughes
be4de46d09 Add the arm64 pstate register to the stack tool.
Also take into account the fact that the arm pcsr register is the
fifth entry on its line, so the stack tool previously stripped that
off.

Change-Id: I1dd2d11060e572b4d8ffd8710cf1df4d970671e4
2014-07-14 17:16:30 -07:00
Elliott Hughes
8de48e2375 Merge "Fix testrunner's reference to icu4c." 2014-07-09 22:27:32 +00:00
Elliott Hughes
4e491e4359 Fix testrunner's reference to icu4c.
I don't know why this has a reference to icu4c.

Change-Id: I36c21b54e6bc4866141a86350ea82ff7903c79a3
2014-07-09 17:13:48 -07:00
Dmitriy Ivanov
ce3b58a6d1 Merge "Update dlext.h header" 2014-07-07 17:50:18 +00:00
Dmitriy Ivanov
b0c2ff09bb Update dlext.h header
Change-Id: Id375e8101f8b86078cdee024184a4ef9d9064928
2014-07-08 15:14:28 -07:00
Andrew Hsieh
dd524f0c91 Merge "Refresh 64-bit headers/libs (WW28)" 2014-07-02 21:24:45 +00:00
Andrew Hsieh
0a33b5dd49 Refresh 64-bit headers/libs (WW28)
Change-Id: Ib798ab4730c3b242bc784548ea2d4ffaea5c90d7
2014-07-08 11:19:20 +08:00
Andrew Hsieh
26e306d9ca Merge "Update mips64 lib-bootstrap" 2014-07-02 20:53:06 +00:00
Andrew Hsieh
76c079eea2 Update mips64 lib-bootstrap
Turns out previously built mips64el* are mips64r2, not mips64r6

Change-Id: Ic0f82fafe959716eb3a909e367d599a3d4293047
2014-07-08 10:51:03 +08:00
Andrew Hsieh
630a1be4ec Merge "Remove symlink lib-boostrap" 2014-07-02 20:53:06 +00:00
Elliott Hughes
17d35eafc6 Merge "Fix symbol.py's toolchain detection for x86." 2014-07-02 20:52:16 +00:00
Elliott Hughes
c3166bec1c Fix symbol.py's toolchain detection for x86.
x86 uses the x86_64 toolchain. There's no separate 32-bit toolchain.

I started to refactor so we could add FindToolchain tests, but that doesn't
work because FindToolchain depends on environment variables set up by 'lunch'.

Change-Id: I264b95e1e83a7e795f8cac49bc9e1cf497514029
2014-07-07 15:18:01 -07:00
Elliott Hughes
afab5877ee Merge "stack_core ProcessLine now returns a boolean." 2014-07-07 19:33:32 +00:00
Brigid Smith
9c2192a26e stack_core ProcessLine now returns a boolean.
The value corresponds to whether or not the line has matched one of the
detected formats (registers, header, backtrace, etc.) and can be used to
identify what logcat lines don't correspond to one of these formats.

Change-Id: Ibd7bc5a211dcfe86ea2f92d7e7941091afff4fc4
2014-07-07 14:53:18 -07:00
Elliott Hughes
121b293903 Merge "stack_core now also detects the "Revision: #" line." 2014-07-02 20:59:15 +00:00
Brigid Smith
0b30940003 stack_core now also detects the "Revision: #" line.
Change-Id: I474602eca37964e412acf8cb5f2441cd223852e4
2014-07-07 14:34:00 -07:00
Elliott Hughes
d1b3bb632a Merge "Fix 'stack' register matching for all architectures." 2014-07-01 14:58:20 +00:00
Elliott Hughes
a9e34173b9 Fix 'stack' register matching for all architectures.
Every architecture was at least slightly wrong. Rather than try to
tune the heuristics, let's just keep lists of all the registers.

Also start adding some unit tests.

Change-Id: I490dcc9855f7af1e3529734711400f366ffc4e0f
2014-07-01 14:56:22 -07:00
Elliott Hughes
401448709d Merge "Fix FindToolchain for mips." 2014-07-01 19:26:36 +00:00
Elliott Hughes
1ba94df0c9 Fix FindToolchain for mips.
Change-Id: Ib2689e24065e9d5a0c249a26c63e6493327fc0b1
2014-07-01 12:22:06 -07:00
Elliott Hughes
d03c4985e7 Merge "Turning stack_core into a class to make it compatible with adbs." 2014-07-01 14:58:13 +00:00