LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,451 Commits 2 Branches 0 Tags
e9555599da16c3e40d0d359f6e46fedfc1f03b1d
Commit Graph

13451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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