Commit Graph

13612 Commits

Author SHA1 Message Date
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
Narayan Kamath
361fce5586 am d9fb901d: am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."
* commit 'd9fb901dc65e6780db5aad1c3bdb53a93dfd371b':
  Track changes to IActivityManager.startInstrumentation.
2014-05-30 10:44:18 +00:00
Narayan Kamath
d9fb901dc6 am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."
* commit '479cf9ff668f04fcc4deb24b115ef766f5115373':
  Track changes to IActivityManager.startInstrumentation.
2014-05-30 10:37:50 +00:00
Narayan Kamath
479cf9ff66 Merge "Track changes to IActivityManager.startInstrumentation." 2014-05-30 10:35:30 +00:00
Narayan Kamath
fc9e3f6878 Track changes to IActivityManager.startInstrumentation.
Change-Id: Iceaecb720c2824134a1d6d13b1f3e0a16d41d76d
2014-05-30 11:33:02 +01:00
Andrew Hsieh
aec2c2ddc9 am ad3e8475: am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)"
* commit 'ad3e847512a3f28bc24f2418a97dbb3108c51559':
  Refresh 64-bit headers/libs (WW21)
2014-05-29 19:15:28 +00:00
Andrew Hsieh
ad3e847512 am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)"
* commit '844bc1d331a8714fbc54492ed119e0db86555d36':
  Refresh 64-bit headers/libs (WW21)
2014-05-29 19:12:25 +00:00
Andrew Hsieh
844bc1d331 Merge "Refresh 64-bit headers/libs (WW21)" 2014-05-29 19:09:37 +00:00
Andrew Hsieh
19f647e8a7 Refresh 64-bit headers/libs (WW21)
Change-Id: I013af3ae4adac17d7b2ef5680d41d75dc9799d19
2014-05-28 21:07:45 +08:00
Raphael Moll
267ddd50d7 am 937cfb42: am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
* commit '937cfb42602c081143e1854ba5f67e18b2f97b46':
  Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:59:48 +00:00
Raphael Moll
937cfb4260 am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
* commit '6e56697cb229cd8c163583a03259a6787f60a84a':
  Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:57:55 +00:00
Raphael Moll
6e56697cb2 Merge "Ability to generate SDK system-images for arm64 and x86_64" 2014-05-28 01:56:17 +00:00
Yigit Boyar
b4c3e94a12 am 67bdb44d: DO NOT MERGE Remove deprecated RecyclerView methods
* commit '67bdb44d980e6f565f4ec3063a6041bbcbab397c':
  DO NOT MERGE Remove deprecated RecyclerView methods
2014-05-28 01:32:00 +00:00
Yigit Boyar
67bdb44d98 DO NOT MERGE Remove deprecated RecyclerView methods
Change-Id: If9b0aca85221d64dbbb5cda75f985a91de6c67d2
2014-05-28 01:18:25 +00:00
Ben Cheng
c4bbd0a628 am 5f7d9640: am 960a770d: Merge "Move the panorama benchmark from packages/apps/Camera to here."
* commit '5f7d9640ae6fc01b058d5d3f09cf2bad21fb8c74':
  Move the panorama benchmark from packages/apps/Camera to here.
2014-05-28 00:22:28 +00:00
Ben Cheng
5f7d9640ae am 960a770d: Merge "Move the panorama benchmark from packages/apps/Camera to here."
* commit '960a770d6c27bd986b15e8cf7579d10d5ccb2b1d':
  Move the panorama benchmark from packages/apps/Camera to here.
2014-05-28 00:18:20 +00:00
Ben Cheng
960a770d6c Merge "Move the panorama benchmark from packages/apps/Camera to here." 2014-05-28 00:15:35 +00:00
Ben Cheng
4b5b3887b9 Move the panorama benchmark from packages/apps/Camera to here.
Also cut unnecessary dependencies on other parts of Android and build
staticly linked binaries so that the benchmark can be run on barebone
systems.

Change-Id: I69ea59c677c750d1982389dd62a6a74e4719d547
2014-05-27 16:12:56 -07:00
Raphael Moll
4986fd4fdd Ability to generate SDK system-images for arm64 and x86_64
(Cherry-picked from 40c7126e7c)

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
2014-05-27 16:10:14 -07:00
Elliott Hughes
d7130107ae am 95387dd1: am f570883a: Merge "Fix MIPS build."
* commit '95387dd16262fbd730eaafcdebdaeeb0a35ea33a':
  Fix MIPS build.
2014-05-23 21:38:07 +00:00
Ying Wang
c5aba03039 am df3def70: am 8eaca3a3: Merge "Host multilib build."
* commit 'df3def709410b63f8c6d41f0f3d1478d5903392e':
  Host multilib build.
2014-05-23 21:38:06 +00:00
Elliott Hughes
95387dd162 am f570883a: Merge "Fix MIPS build."
* commit 'f570883afaad1887da8c30fbfa51e70ffa6f268e':
  Fix MIPS build.
2014-05-23 21:34:25 +00:00
Ying Wang
df3def7094 am 8eaca3a3: Merge "Host multilib build."
* commit '8eaca3a30e184e235c0dcd0acabb9268a7bf25bf':
  Host multilib build.
2014-05-23 21:34:23 +00:00
Elliott Hughes
f570883afa Merge "Fix MIPS build." 2014-05-23 21:31:18 +00:00
Ying Wang
8eaca3a30e Merge "Host multilib build." 2014-05-23 21:28:26 +00:00
Elliott Hughes
caebfa9b50 Fix MIPS build.
We really ought to remove libportable.

Bug: 14903517
Change-Id: Id96b24bfe329096adffd94d452f440295d8aa83a
2014-05-23 14:24:15 -07:00
Xavier Ducrohet
c32cb7040f am f8a99a45: Reset version number to .0.0 for new API level SDK.
* commit 'f8a99a451bfbdcf75bb2c835f17cc8471321cbe2':
  Reset version number to .0.0 for new API level SDK.
2014-05-22 16:46:31 +00:00
Xavier Ducrohet
f8a99a451b Reset version number to .0.0 for new API level SDK.
Change-Id: I0765de9dbb4f354c0b0a411b71bfcecb6797c632
2014-05-22 09:27:02 -07:00
Ying Wang
3bc8fd9e50 Host multilib build.
Bug: 13751317
Change-Id: I05ad98c1f3f55e3288fbcc169311a7685b872fd9
2014-05-20 17:59:48 -07:00
Raphael Moll
f786331925 am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master
* commit '261307bebe8986599055bb97d5587977c8da53eb':
  Fix SDK build.
2014-05-20 23:35:46 +00:00