Commit Graph

13502 Commits

Author SHA1 Message Date
Ying Wang
c8ed8c25bc am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"
* commit 'bcfa67e56dd7862d085954d2c4b349f8199c3d28':
  Switch to SDK_HOST_ARCH
2014-06-10 16:30:41 +00: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
e233c41694 am 86509e1d: am 0e85aa03: Merge "Add missing mips64 lib-bootstrap"
* commit '86509e1de09f05c3f03073c6f3b399a73158cbe9':
  Add missing mips64 lib-bootstrap
2014-06-10 01:14:55 +00: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
9cec99d954 am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."
* commit 'ea21b8169062fecf0bf32abafc5892ad3beb8238':
  Generate api-versions.xml for lint.
2014-06-09 23:52:02 +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
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
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
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