Commit Graph

13428 Commits

Author SHA1 Message Date
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
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
Raphael Moll
261307bebe resolved conflicts for merge of bf164835 to stage-aosp-master
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
2014-05-20 16:29:29 -07:00
Raphael Moll
bf164835e6 Merge "Fix SDK build." 2014-05-20 21:12:26 +00:00
Raphael Moll
e9a7920ca4 Fix SDK build.
development's sdk.atree depends on the generated file
/sdk/files/sdk_files_NOTICE.txt which was accumulating
all the tools notices.

However this file isn't generated anymore.
This replaces it by a static file.

This is only good as a temporary measure to fix the build.
The proper fix is to recreate the SDK rule to generate the
combined NOTICE.txt and move it in development.git

Change-Id: I27e4f38e756b81b002d16dfac5ccaa54a4463786
2014-05-20 14:10:47 -07:00
Andrew Hsieh
9d0a4a6eca am 5f3ed7dd: am 80bc4f93: Merge "Refresh 64-bit headers/libs (WW20)"
* commit '5f3ed7ddd0b3708baadf5ce357c74e331c16f986':
  Refresh 64-bit headers/libs (WW20)
2014-05-19 01:29:21 +00:00
Andrew Hsieh
5f3ed7ddd0 am 80bc4f93: Merge "Refresh 64-bit headers/libs (WW20)"
* commit '80bc4f931edb0c56473ba89a132e56ac99995420':
  Refresh 64-bit headers/libs (WW20)
2014-05-19 01:26:02 +00:00
Andrew Hsieh
80bc4f931e Merge "Refresh 64-bit headers/libs (WW20)" 2014-05-19 01:21:47 +00:00
Chet Haase
98253982ea am 3b3ab0e0: Add demo for animating RecyclerView actions
* commit '3b3ab0e040ecbeee2f916b969b1044a2b9e222bd':
  Add demo for animating RecyclerView actions
2014-05-17 16:00:45 +00:00
Chet Haase
3b3ab0e040 Add demo for animating RecyclerView actions
Change-Id: Ie076db6646cf734706fe2ea8659ee57f3a7742e9
2014-05-17 15:21:44 +00:00
Andrew Hsieh
2c91491806 Refresh 64-bit headers/libs (WW20)
Change-Id: I91c4a89635a075d2264e43c51f56b70fe999152f
2014-05-17 06:37:26 +08:00
Raphael Moll
7401fa161f am 8aa49aef: am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
* commit '8aa49aef8adb24a1b977d89b60a48a781e4e6674':
  SDK: support generating repository XML with latest XSD.
2014-05-16 20:12:42 +00:00
Raphael Moll
8aa49aef8a am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
* commit 'f9f829e51afe3906458a81cb4efb75a051c64c04':
  SDK: support generating repository XML with latest XSD.
2014-05-16 20:09:40 +00:00
Raphael Moll
f9f829e51a Merge "SDK: support generating repository XML with latest XSD." 2014-05-16 20:05:47 +00:00
Andrew Hsieh
e21f842a03 am 44e42e61: am 67dc50cb: Merge changes Ie67acf11,Ia9c03558
* commit '44e42e61ab33b2dc094729a2bd24d7eba5ddbecc':
  Remove non-existanec functions/variables from libc.so
  Restore stdint.h for android-3..19 to the original headers
2014-05-16 03:22:16 +00:00
Andrew Hsieh
908d100eff am fa00a604: am abc6d891: Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"
* commit 'fa00a60465f3f712193ee062b13be5f79b5d1ba9':
  Update lib-boostrape for 64-bit libraries built with GCC toolchain
2014-05-16 03:22:15 +00:00
Andrew Hsieh
44e42e61ab am 67dc50cb: Merge changes Ie67acf11,Ia9c03558
* commit '67dc50cbbbf5d3cf873495d4d5ae1e67f29ffe9e':
  Remove non-existanec functions/variables from libc.so
  Restore stdint.h for android-3..19 to the original headers
2014-05-16 03:18:38 +00:00
Andrew Hsieh
fa00a60465 am abc6d891: Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"
* commit 'abc6d891a037e33fe70cc24a032efa58a10d16fa':
  Update lib-boostrape for 64-bit libraries built with GCC toolchain
2014-05-16 03:18:36 +00:00
Andrew Hsieh
67dc50cbbb Merge changes Ie67acf11,Ia9c03558
* changes:
  Remove non-existanec functions/variables from libc.so
  Restore stdint.h for android-3..19 to the original headers
2014-05-16 03:17:19 +00:00
Andrew Hsieh
abc6d891a0 Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain" 2014-05-16 03:16:21 +00:00
Raphael Moll
ea40d2f4c5 SDK: support generating repository XML with latest XSD.
The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
  get their own XML file.

Change-Id: If5820a84d5c754b816b17b5713bbdb2597736eff
2014-05-15 17:49:02 -07:00
Andrew Hsieh
0810f8a6ec am 7e3d050a: am 2f35f1fa: Merge "Update android-20 wchar.h up to bionic state."
* commit '7e3d050add2d534b6e48353362cf7598f5f8f3f7':
  Update android-20 wchar.h up to bionic state.
2014-05-16 00:34:09 +00:00
Andrew Hsieh
7e3d050add am 2f35f1fa: Merge "Update android-20 wchar.h up to bionic state."
* commit '2f35f1fa51db20695be65668986e44dd80da9616':
  Update android-20 wchar.h up to bionic state.
2014-05-16 00:30:21 +00:00
Andrew Hsieh
2f35f1fa51 Merge "Update android-20 wchar.h up to bionic state." 2014-05-16 00:27:28 +00:00
Arseniy Antonov
4e1ef36772 Update android-20 wchar.h up to bionic state.
Corresponding changes in bionic:
Ia9bd0785bc42c7b46e2bb6c3d9b9a9d3f769d983
I5abdc7cc3c27c109b7900c94b112f18a95c35763

Change-Id: Ie86fd15226fe552b6f0e60c24debbe1d79f7a332
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
2014-05-15 18:48:19 +04:00
Andrew Hsieh
3dc9183a69 am 2ec7a5c0: am a5afedd2: Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build"
* commit '2ec7a5c0f679a0d1e83ebc55479d1b8bbcb79f7d':
  Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build
2014-05-15 11:07:26 +00:00
Andrew Hsieh
2ec7a5c0f6 am a5afedd2: Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build"
* commit 'a5afedd2e21846f8cd8d662c4a7ef7ec3dc6dfee':
  Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build
2014-05-15 11:03:55 +00:00
Andrew Hsieh
a5afedd2e2 Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build" 2014-05-15 11:01:00 +00:00
Chet Haase
b360b2e8c1 am abbe7bd1: Revert "Add demo for animating RecyclerView actions"
* commit 'abbe7bd1e0f7ecc64a9f542b8d0eb78de7e567fe':
  Revert "Add demo for animating RecyclerView actions"
2014-05-15 00:17:26 +00:00
Chet Haase
abbe7bd1e0 Revert "Add demo for animating RecyclerView actions"
This reverts commit 828b2aa2f4.

Change-Id: I0f773b5c42530cad924e454dc816ddc372db95f7
2014-05-15 00:01:07 +00:00
Chet Haase
ff3d094e86 am 828b2aa2: Add demo for animating RecyclerView actions
* commit '828b2aa2f42b0e079e05c560e749835bef3ef71f':
  Add demo for animating RecyclerView actions
2014-05-14 21:06:07 +00:00
Chet Haase
828b2aa2f4 Add demo for animating RecyclerView actions
Change-Id: Ieb14cfb627663f507c24205d697347a1da389094
2014-05-14 14:01:18 -07:00
David 'Digit' Turner
a9206776fe am 3907ebb7: am 94ebf1e6: Merge "libportable: Add dependency on libdl."
* commit '3907ebb75e450b02f6996f6fa368ca0d2bacfb4a':
  libportable: Add dependency on libdl.
2014-05-12 13:36:05 +00:00
David 'Digit' Turner
3907ebb75e am 94ebf1e6: Merge "libportable: Add dependency on libdl."
* commit '94ebf1e6a993391f8139e4ee4702c02bdda560a9':
  libportable: Add dependency on libdl.
2014-05-12 13:31:55 +00:00
David 'Digit' Turner
94ebf1e6a9 Merge "libportable: Add dependency on libdl." 2014-05-12 13:28:34 +00:00