Elliott Hughes
fc800c1dba
am 877b9486: am 815d7a7d: Merge "Fix build by removing libportable from the default build."
...
* commit '877b94867c7f420ab0d2f4e0ba7a3f6cc7c1f6e1':
Fix build by removing libportable from the default build.
2014-06-09 22:00:01 +00: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
397301be5e
am b71ef233: am ecfe9d09: Merge "64-bit mips64el-* multilib sysroot"
...
* commit 'b71ef23353f15a670637e337891c75c2ea806aea':
64-bit mips64el-* multilib sysroot
2014-06-09 01:11:44 +00: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
7d1aa27155
am 55dc8e65: am 91e2c5dc: Merge "Fix libportable build breakage."
...
* commit '55dc8e65c24e3b0dd99049d9552b6f5c96ba5eea':
Fix libportable build breakage.
2014-06-08 08:29:35 +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
fcabb6e7aa
am 95671f78: am 03afa4d6: Merge "Android USB driver: support 4EE7 (Nexus adb only)."
...
* commit '95671f78a5a32307aee79f3e86c62f92c26ac49a':
Android USB driver: support 4EE7 (Nexus adb only).
2014-06-06 22:23:19 +00: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
6ed7e6dfcc
am ea385828: am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
...
* commit 'ea3858285b2876d241218f9319cc256972160c1c':
ndk: Remove extra GLES symbols on 64-bit platforms
2014-06-06 16:32:44 +00: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
Jesse Hall
2433ffdef5
ndk: Remove extra GLES symbols on 64-bit platforms
...
The original arch-arm libGLESv1_CM.so and libGLESv2.so symbols in
android-4 and android-5 were correct. They didn't include some vendor
extension symbols that are in the platform library but that apps
should query at runtime rather than link against.
When arch-x86 and arch-mips were added in android-9, they mistakenly
included these extension symbols. Oh well, for compatibility we can't
fix that now.
The android-20 symbols for all architectures were copied from x86 or
mips, and include the extension symbols. To avoid spreading the
mistake, this change:
(a) Removes the symbol files for architectures that existed in earlier
versions of the platform, since they shouldn't change in android-20.
(b) Removes the extension symbols on 64-bit platforms, so they match
the symbols in arch-arm.
Change-Id: Ib227d9d163bfe2859b13eb57dc19518d3a3f90d0
2014-06-05 18:36:32 -07:00
Raphael Moll
adcf12ed08
am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
...
* commit '4000df931bb1b0f9a9e37430212124a9c37e6972':
Move SDK system-image source.prop_templates in their own folder.
2014-06-04 21:58:54 +00:00
Raphael Moll
4000df931b
am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
...
* commit '6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc':
Move SDK system-image source.prop_templates in their own folder.
2014-06-04 21:46:13 +00:00
Raphael Moll
6ab8ef21b8
Merge "Move SDK system-image source.prop_templates in their own folder."
2014-06-04 21:30:14 +00:00
Steve Moyer
aed525497f
am d87e9d35: (-s ours) am e561dd48: (-s ours) DO NOT MERGE: fix package for AndroidJUnitRunner
...
* commit 'd87e9d353430779e00551eb394f5b9340099470a':
DO NOT MERGE: fix package for AndroidJUnitRunner
2014-06-04 17:29:04 +00:00
Steve Moyer
a0fc195e77
am bbf18071: (-s ours) am 23a8adf2: (-s ours) DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
* commit 'bbf180719d3b1db093111bff1319cc647e904f5a':
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
2014-06-04 17:29:03 +00:00
Steve Moyer
d87e9d3534
am e561dd48: (-s ours) DO NOT MERGE: fix package for AndroidJUnitRunner
...
* commit 'e561dd484613737f0ee9289bab4be4361b3fab31':
DO NOT MERGE: fix package for AndroidJUnitRunner
2014-06-04 17:12:13 +00:00
Steve Moyer
bbf180719d
am 23a8adf2: (-s ours) DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
* commit '23a8adf276448f68efb049a2f2ef3409af59dd1c':
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
2014-06-04 17:01:46 +00:00
Steve Moyer
e561dd4846
DO NOT MERGE: fix package for AndroidJUnitRunner
...
Change-Id: I6b3fb006212f273d018121800d1d94e8a8d7404d
2014-06-04 09:59:22 -07:00
Steve Moyer
23a8adf276
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-04 09:55:31 -07:00
Andrew Hsieh
f77a689ffd
64-bit mips64el-* multilib sysroot
...
Change-Id: I88fb4492d16eece4347589da75fe1ed2ed7d2254
2014-06-04 23:42:16 +08:00
Raphael Moll
95a5c56c8f
am 728f321c: Merge "Add Build-Tools runtime.properties file."
...
* commit '728f321cb94220e1f7d1d72759b6c6b342152c15':
Add Build-Tools runtime.properties file.
2014-06-04 09:55:53 +00:00
Raphael Moll
728f321cb9
Merge "Add Build-Tools runtime.properties file."
2014-06-04 04:05:07 +00:00
Raphael Moll
26bcf6a511
Move SDK system-image source.prop_templates in their own folder.
...
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.
Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616
2014-06-03 17:30:16 -07:00
Raphael Moll
37433ac223
Add Build-Tools runtime.properties file.
...
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
2014-06-03 13:46:51 -07:00
Andrew Hsieh
172b2a2822
am 80bc9315: Merge "Fix warning about undefined __LP64__"
...
* commit '80bc93153df481a2bb86bc2f384af681836f37a5':
Fix warning about undefined __LP64__
2014-06-03 07:51:33 +00:00
Andrew Hsieh
be5b713adf
am 7f4142f2: Merge "Refresh 64-bit headers/libs (WW22)"
...
* commit '7f4142f25e7f9510b0e3e484a0a3ae70cd03d567':
Refresh 64-bit headers/libs (WW22)
2014-06-03 07:46:56 +00:00
Andrew Hsieh
80bc93153d
Merge "Fix warning about undefined __LP64__"
2014-06-03 07:33:17 +00:00
Andrew Hsieh
7f4142f25e
Merge "Refresh 64-bit headers/libs (WW22)"
2014-06-03 07:25:05 +00:00
Raphael Moll
e9555599da
am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets."
...
* commit '087ccb01527d9d7e8981751639c65b1eb6369534':
Fix SDK repo to prevent mixing different targets.
2014-06-03 02:56:09 +00:00
Raphael Moll
087ccb0152
Merge "Fix SDK repo to prevent mixing different targets."
2014-06-03 01:27:03 +00:00
Raphael Moll
4df9f469f7
Fix SDK repo to prevent mixing different targets.
...
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.
Also fix a warning when generating the repo.xml files.
Change-Id: I645ad13936b83c5c33bd84c046b60b77488b9113
2014-06-02 17:11:45 -07:00
Andrew Hsieh
097f3d628a
am 37f7e742: am e7a46c48: Merge "Add lib symlink to x86_64 so that 32-bit static libs are available"
...
* commit '37f7e7421f349513de5f6ee06f402a09b9783bf3':
Add lib symlink to x86_64 so that 32-bit static libs are available
2014-06-02 11:39:09 +00:00
Andrew Hsieh
37f7e7421f
am e7a46c48: Merge "Add lib symlink to x86_64 so that 32-bit static libs are available"
...
* commit 'e7a46c48417ff67390d80d6df457742b30430857':
Add lib symlink to x86_64 so that 32-bit static libs are available
2014-06-02 07:09:38 +00:00
Andrew Hsieh
e7a46c4841
Merge "Add lib symlink to x86_64 so that 32-bit static libs are available"
2014-06-02 07:06:48 +00:00
Andrew Hsieh
e85f942ec6
Fix warning about undefined __LP64__
...
See b.android.com/69975
Change-Id: If7f2b6fa29c36221b1a0d31a334cb34cecb4e8bc
2014-06-02 14:44:19 +08:00
Pavel Chupin
2e807e16dc
Add lib symlink to x86_64 so that 32-bit static libs are available
...
When multilib toolchain in NDK is used in -m32 mode we need 32-bit static libs
available for static compilation.
Change-Id: Ie7b5659f05338565fd19550ae4368934422e8b86
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2014-06-01 18:52:16 +04:00
Ben Cheng
f8ca5a9e22
am dc898c78: am 550e4425: Merge "Build both 64- and 32-bit versions."
...
* commit 'dc898c7838c98dee558aace12c11553ebff2efc7':
Build both 64- and 32-bit versions.
2014-05-30 17:07:49 +00:00
Ben Cheng
dc898c7838
am 550e4425: Merge "Build both 64- and 32-bit versions."
...
* commit '550e44253f2eb23b909c80c9a9717c2cc36b4b8b':
Build both 64- and 32-bit versions.
2014-05-30 17:04:47 +00:00
Ben Cheng
550e44253f
Merge "Build both 64- and 32-bit versions."
2014-05-30 17:00:01 +00:00
Ben Cheng
c54a9369f0
Build both 64- and 32-bit versions.
...
Change-Id: I9e641cebcd71cb680ecb326e8c75e68e7d016ea4
2014-05-30 09:58:47 -07:00
Andrew Hsieh
727ac63f0a
Refresh 64-bit headers/libs (WW22)
...
Change-Id: Ic49750508a4c825e6ac222d8cd417e71dae53cbd
2014-05-30 23:21:02 +08:00