Andrew Hsieh
093774e6e6
am b50f8f66: Merge "Add APP_ABI for module-exports sample"
...
* commit 'b50f8f6612c74ad78194555e8a3d5a3441eedf02':
Add APP_ABI for module-exports sample
2014-07-21 13:06:32 +00:00
Andrew Hsieh
41c211692c
am 30c2909f: Merge "Refresh 64-bit headers/libs (WW29)"
...
* commit '30c2909f512939f3cb51cc9682bca3235299e149':
Refresh 64-bit headers/libs (WW29)
2014-07-21 10:35:44 +00:00
Andrew Hsieh
8e1ad1c94d
am fa902f33: Merge "Fix gl3stub.h"
...
* commit 'fa902f33442e0a2c35edd6b84638009f491350ac':
Fix gl3stub.h
2014-07-21 10:35:43 +00:00
Yohann Roussel
96489645ab
am e15f6511: Merge "Move multidex support library"
...
* commit 'e15f6511b7a86622dbc63392830ecd61df4da6e0':
Move multidex support library
2014-07-18 10:55:29 +00:00
Yohann Roussel
a7aa5e0e86
am 2d2ce1b6: Merge "Add res folder to multidex SDK projects."
...
* commit '2d2ce1b6c3d8dc221ac783103b116ce8dcdfd7e2':
Add res folder to multidex SDK projects.
2014-07-18 10:55:27 +00:00
Yohann Roussel
8a8f24886d
am 93b72e47: Merge "android-support-multidex-instrumentation in SDK."
...
* commit '93b72e4703204b1ba15929a9b30e5b2ec3febfa5':
android-support-multidex-instrumentation in SDK.
2014-07-18 10:55:26 +00:00
Yohann Roussel
b8db294e23
am c854c636: Merge "Add multidex ADT project to SDK."
...
* commit 'c854c636d9396cc412dd2efdb69eae8ae22969fa':
Add multidex ADT project to SDK.
2014-07-18 10:55:25 +00:00
Yohann Roussel
7ec33a7cf3
am 0d1b03f1: Merge "Include android-support-multidex in SDK libs."
...
* commit '0d1b03f127ff2fd0b6a6d79dbf76c6ab8debb527':
Include android-support-multidex in SDK libs.
2014-07-18 10:55:24 +00:00
Andrew Hsieh
fa902f3344
Merge "Fix gl3stub.h"
2014-07-17 23:12:27 +00:00
Andrew Hsieh
b50f8f6612
Merge "Add APP_ABI for module-exports sample"
2014-07-17 22:52:20 +00:00
Arseniy Antonov
22359ed8bf
Add APP_ABI for module-exports sample
...
Add APP_ABI := all
to be able to compile this sample for all platforms
without additional manual manipulations.
Change-Id: I8ebb98c86dae2f6e926885b6d70d306ceca33d1f
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com >
2014-07-21 16:51:46 +04:00
Andrew Hsieh
30c2909f51
Merge "Refresh 64-bit headers/libs (WW29)"
2014-07-17 22:52:20 +00:00
Andrew Hsieh
cc101e0860
Refresh 64-bit headers/libs (WW29)
...
Change-Id: Ifaee25e70db14327c6f8104b04bf3abd71493477
2014-07-19 16:03:48 +08: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
c854c636d9
Merge "Add multidex ADT project to SDK."
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
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
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
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
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
a6b673cd97
am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap"
...
* commit '37feee2abc4f975962fbfab4052834800669964e':
Update mipsel and mips64el multilib lib* and lib-bootstrap
2014-07-17 12:30:41 +00:00
Andrew Hsieh
430b78ad74
am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib"
...
* commit '37351fdd10ba1f4aba08c6da661acb3188576fd2':
Remove symlink ndk/platforms/android-L/arch-mips64/lib
2014-07-17 12:30:40 +00:00
Andrew Hsieh
61aaedb278
am 488f2392: Merge "getSampletime -> getSampleTime"
...
* commit '488f2392a55e426f63966f118bfbf46c3f850f35':
getSampletime -> getSampleTime
2014-07-17 12:30:39 +00:00
Andrew Hsieh
b240fe6de0
am 2918193e: Merge "Media NDK files"
...
* commit '2918193e0b792e089a8373817f3f485a037eca2f':
Media NDK files
2014-07-17 12:30:38 +00:00
Andrew Hsieh
37b6479017
am 8092009a: Merge "NDK media codec sample"
...
* commit '8092009a49c525f4fefd053cffac23cc665ba3ef':
NDK media codec sample
2014-07-17 12:30:37 +00:00
Andrew Hsieh
b74edf6b28
am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so"
...
* commit '6fdc2791028c283f2068fcc935fb7928374e19c1':
ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
2014-07-17 12:30:36 +00:00
Andrew Hsieh
2097b3b7e7
am 8839697e: Merge "Update OpenSLES_Android.h for API L"
...
* commit '8839697e9cd8efb0c916fde9bbc292e552d21adf':
Update OpenSLES_Android.h for API L
2014-07-17 12:30:35 +00: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
8092009a49
Merge "NDK media codec sample"
2014-07-17 04:16:20 +00: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
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
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
2918193e0b
Merge "Media NDK files"
2014-07-17 04:07:19 +00:00
Andrew Hsieh
8839697e9c
Merge "Update OpenSLES_Android.h for API L"
2014-07-17 04:07:19 +00:00
Elliott Hughes
14a67c7e70
am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes."
...
* commit 'be5e8f728a7daa64049a20a61a65d83570f2448d':
Stack tool 32/64 bit compatibility fixes.
2014-07-17 00:21:02 +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
fbc6605794
am 535decd2: Merge "Add the arm64 pstate register to the stack tool."
...
* commit '535decd2bc4c94713d006ccfdfb0aa8fe28c8662':
Add the arm64 pstate register to the stack tool.
2014-07-15 01:54:13 +00:00
Elliott Hughes
535decd2bc
Merge "Add the arm64 pstate register to the stack tool."
2014-07-14 23:57:35 +00:00