Andrew Hsieh
eacb09c3da
am 5fcf5cfc: Merge "Refresh 64-bit headers/libs (WW25)"
...
* commit '5fcf5cfc02cb36523886c916ff214165def9a5d4':
Refresh 64-bit headers/libs (WW25)
2014-06-21 04:21:13 +00:00
Andrew Hsieh
5fcf5cfc02
Merge "Refresh 64-bit headers/libs (WW25)"
2014-06-21 03:13:40 +00:00
Andrew Hsieh
1b1f01913c
Refresh 64-bit headers/libs (WW25)
...
To bionic: 06366724d572ef005f5bc0ddd8ad46794cbfad3b
Change-Id: I4c676127d357445fc5d09a2c82c5664238105b90
2014-06-20 15:32:42 -07:00
Brian Carlstrom
ef3d4ea038
am 2f43b93f: Merge "Replace libdvm reference with libart"
...
* commit '2f43b93fabb8f16e68825fb0476f947ab981ea56':
Replace libdvm reference with libart
2014-06-19 23:13:00 +00:00
Brian Carlstrom
2f43b93fab
Merge "Replace libdvm reference with libart"
2014-06-19 20:38:20 +00:00
Brian Carlstrom
a79fd769c1
Replace libdvm reference with libart
...
Bug: 14298175
Change-Id: Ia4ff2af37e977be5d03d2d6e118e8b89d607a732
2014-06-19 14:11:09 -07:00
Elliott Hughes
6e21ec3fc9
am 9811d58e: Merge "Add the "Abort message:" line to the preserved stack output."
...
* commit '9811d58e78e6485c5d006331bcf7ae0716af061a':
Add the "Abort message:" line to the preserved stack output.
2014-06-18 00:37:06 +00:00
Elliott Hughes
9811d58e78
Merge "Add the "Abort message:" line to the preserved stack output."
2014-06-17 20:49:57 +00:00
Elliott Hughes
d2471c871f
Add the "Abort message:" line to the preserved stack output.
...
When QA paste a stack in to the decoder, we don't want to lose the
abort message.
Bug: 15701333
Change-Id: I538aab6b5cb6c20534b1b7027aec32bd78ee060c
2014-06-17 16:55:10 -07:00
Steve Moyer
0e4895c43d
Merge "DO NOT MERGE: fix package for AndroidJUnitRunner" into stage-aosp-master
2014-06-17 05:00:50 +00:00
Steve Moyer
b5d6adee6c
Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" into stage-aosp-master
2014-06-17 04:50:03 +00:00
Elliott Hughes
c1168dc4c3
am 04a53e2f: Merge "Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in \'stack\'."
...
* commit '04a53e2fd7d5331a1977a0e305b883e84a7825b9':
Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in 'stack'.
2014-06-16 17:49:03 +00:00
Elliott Hughes
04a53e2fd7
Merge "Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in 'stack'."
2014-06-16 17:32:31 +00:00
Elliott Hughes
0836593b85
Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in 'stack'.
...
This fixes the bug where we can't (currently) find the toolchain
for arm because it's at a different GCC version (4.8) from arm64 (4.9).
Change-Id: I22351af55298255f3ac4adfcae7e20080712fba4
2014-06-16 10:40:22 -07:00
Steve Moyer
a0fe65e088
DO NOT MERGE: fix package for AndroidJUnitRunner
...
Change-Id: I6b3fb006212f273d018121800d1d94e8a8d7404d
2014-06-16 09:55:38 -07:00
Steve Moyer
d0e4e438b9
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest
Conflicts:
build/sdk.atree
Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-06-16 09:54:37 -07:00
Elliott Hughes
1b0d9bf133
am 8b1c1b30: Merge "Updating stack_core.py to recognize new ABI output from debuggerd."
...
* commit '8b1c1b304203544bed76786064d685ec06e95593':
Updating stack_core.py to recognize new ABI output from debuggerd.
2014-06-14 00:48:59 +00:00
Elliott Hughes
8b1c1b3042
Merge "Updating stack_core.py to recognize new ABI output from debuggerd."
2014-06-13 21:10:05 +00:00
Brigid Smith
45a46c6138
Updating stack_core.py to recognize new ABI output from debuggerd.
...
Change-Id: Ib9736a0509edb97be15f5e89dbc3a5188e744416
2014-06-13 17:43:38 -07:00
Andrew Hsieh
2a97fd08a7
am e577c6b4: Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX"
...
* commit 'e577c6b4e3fbc35768f400b40951f43e88a61033':
Fix ssize_t, WCHAR_MIN and WCHAR_MAX
2014-06-13 19:05:27 +00:00
Andrew Hsieh
31a7026b66
am 724e3468: Merge "Update libm_hard.a"
...
* commit '724e34687c3cf77946fe94c7e655e7ab5e0f7124':
Update libm_hard.a
2014-06-13 16:32:37 +00:00
Andrew Hsieh
724e34687c
Merge "Update libm_hard.a"
2014-06-12 03:32:07 +00:00
Andrew Hsieh
e577c6b4e3
Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX"
2014-06-10 21:55:12 +00:00
Raphael Moll
8235126ebf
am 9649c415: Merge "Change api-versions.xml generator source order."
...
* commit '9649c415e7e959b67a8810cd17ab65b7994c0f71':
Change api-versions.xml generator source order.
2014-06-10 21:08:36 +00:00
Raphael Moll
9649c415e7
Merge "Change api-versions.xml generator source order."
2014-06-10 21:00:58 +00:00
Raphael Moll
7d86138caa
Change api-versions.xml generator source order.
...
The generator now takes files first from prebuilts/tools
and then if not found takes them from prebuilds/sdk.
Change-Id: Ia099c26202292537e92eaaaa5c26ad2916114f1e
2014-06-10 11:10:57 -07:00
Ying Wang
bcfa67e56d
am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"
...
* commit '1e1b10acd152ae67670587ef1682ba6a3ed8a66c':
Switch to SDK_HOST_ARCH
2014-06-10 16:28:00 +00:00
Ying Wang
1e1b10acd1
Merge "Switch to SDK_HOST_ARCH"
2014-06-10 16:26:22 +00:00
Andrew Hsieh
a5c12d1936
Update libm_hard.a
...
1) Add ldexp. ldexp used to co-exist in both libc.so and libm.so until
the removal from libm.so in ICS. Unfortunately the sole copy of libm_hard.a
in NDK was compiled from JB source and miss ldexp. Code compiled with
hard-float using ldexp may use libc.so which follows soft-float and misbehave
2) Turns out the following (all in fpclassify.o) also exists in recent libc.so
too. Add them in libm_hard.a as well:
__fpclassifyd
__fpclassifyf
__fpclassifyl
__isfinitef
__isfinite
__isfinitel
__isinff
__isinf
__isinfl
__isnanl
__isnormalf
__isnormal
__isnormall
isinf
isnan
isnanf
Change-Id: Ia157fb2911341988de102e55d0c6f6141a9c3dda
2014-06-10 10:58:37 +08:00
Andrew Hsieh
9983b467e5
Fix ssize_t, WCHAR_MIN and WCHAR_MAX
...
1) ssize_t is int, instead of long int
2) WCHAR_MIN and WCHAR_MAX be consistent with bionic's:
respond to __WCHAR_UNSIGNED__, work for both signed (X86/MIPS)
and unsigned (ARM) wchar_t, and work for -fshort-wchar too
Change-Id: Ief1be007571b50c5d63a819df489f9d3f9b47bc8
2014-06-10 10:51:46 +08:00
Andrew Hsieh
86509e1de0
am 0e85aa03: Merge "Add missing mips64 lib-bootstrap"
...
* commit '0e85aa033e1d97ecd3578cf30f7c90028e1dcb91':
Add missing mips64 lib-bootstrap
2014-06-10 01:12:31 +00:00
Andrew Hsieh
0e85aa033e
Merge "Add missing mips64 lib-bootstrap"
2014-06-10 01:08:44 +00:00
Raphael Moll
ea21b81690
am 28748be7: Merge "Generate api-versions.xml for lint."
...
* commit '28748be7e5a95ca32fd4b930be05ad4bdd365a43':
Generate api-versions.xml for lint.
2014-06-09 23:49:42 +00:00
Raphael Moll
28748be7e5
Merge "Generate api-versions.xml for lint."
2014-06-09 23:47:28 +00:00
Raphael Moll
4f8a38ed7a
Generate api-versions.xml for lint.
...
Depends on:
- tools/base I747d27e998c6dbd61dd17c44bfc747c9542e33d1
- tools/buildSrc I400f4b6c146836ba30e6e7985ca6c9894985a8cb
- prebuilts/tools Ia4b0c477cf6f4788de610be017a9f5b43d73486c
Change-Id: I3f791d5e1d0ea893cdb5969854d9ae99d5fbb5b7
2014-06-09 15:59:58 -07:00
Ying Wang
e7db94431e
Switch to SDK_HOST_ARCH
...
SDK_HOST_ARCH will be x86 if we are doing 32-bit host multilib build,
in which HOST_ARCH is actually x86_64.
Bug: 13751317
Change-Id: I8b7893b10cc4d0e71076b3b3625ec2f352aa8602
2014-06-09 15:03:04 -07:00
Elliott Hughes
877b94867c
am 815d7a7d: Merge "Fix build by removing libportable from the default build."
...
* commit '815d7a7d05cc95f828f463afc4ac7d52bb0f1b53':
Fix build by removing libportable from the default build.
2014-06-09 21:55:58 +00:00
Elliott Hughes
815d7a7d05
Merge "Fix build by removing libportable from the default build."
2014-06-09 21:52:26 +00:00
Elliott Hughes
cbe970b82a
Fix build by removing libportable from the default build.
...
Easier than working out how to fix the fenv stuf...
Change-Id: Id457d4fcd790b1fc13047cba29c7d47118196a87
2014-06-09 14:51:24 -07:00
Andrew Hsieh
2ae52388f3
Add missing mips64 lib-bootstrap
...
Such that the following can correctly populate sysroot just enough to rebuild
mips64el toolchain
./build/tools/gen-platforms.sh --minimal --dst-dir=$NDK --ndk-dir=$NDK --arch=mips64
Change-Id: Ib37516bfe4c4b6a0c5b479d7cec8764c161f02c8
2014-06-09 17:37:46 +08:00
Andrew Hsieh
b71ef23353
am ecfe9d09: Merge "64-bit mips64el-* multilib sysroot"
...
* commit 'ecfe9d094677cc5fc9e04b8681893f78a87926f1':
64-bit mips64el-* multilib sysroot
2014-06-09 01:09:24 +00:00
Andrew Hsieh
ecfe9d0946
Merge "64-bit mips64el-* multilib sysroot"
2014-06-09 01:06:34 +00:00
Elliott Hughes
55dc8e65c2
am 91e2c5dc: Merge "Fix libportable build breakage."
...
* commit '91e2c5dcde466a1f147220b3c753862b77a5da9e':
Fix libportable build breakage.
2014-06-08 05:33:30 +00:00
Elliott Hughes
91e2c5dcde
Merge "Fix libportable build breakage."
2014-06-08 05:30:16 +00:00
Elliott Hughes
fc9ac9f173
Fix libportable build breakage.
...
Change-Id: Ic85e36cf55b7486b50fc9f1513f10a8ade5e86e9
2014-06-07 22:24:44 -07:00
Raphael Moll
95671f78a5
am 03afa4d6: Merge "Android USB driver: support 4EE7 (Nexus adb only)."
...
* commit '03afa4d6719a52180f1d553590a4f33d5dd08377':
Android USB driver: support 4EE7 (Nexus adb only).
2014-06-06 22:07:30 +00:00
Raphael Moll
03afa4d671
Merge "Android USB driver: support 4EE7 (Nexus adb only)."
2014-06-06 22:03:05 +00:00
Raphael Moll
700c6fd81d
Android USB driver: support 4EE7 (Nexus adb only).
...
Bug: b/14988808
Change-Id: Ib855f063c949649c059da09483f782d09fbf3d2c
2014-06-06 12:50:21 -07:00
Jesse Hall
ea3858285b
am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
...
* commit '3d1f08375865a75ab6f67a45967cf9ad0c19ef72':
ndk: Remove extra GLES symbols on 64-bit platforms
2014-06-06 16:16:57 +00:00
Jesse Hall
3d1f083758
Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
2014-06-06 16:13:37 +00:00