| Stephen Hines | 031afa3 | 2012-03-08 14:16:16 -0800 | [diff] [blame] | 1 | /* |
| 2 | * README.android describes in high-level the compiler-rt changes that we |
| 3 | * cannot push upstream to the llvm.org repository: |
| 4 | * - Changes due to Android's build system. |
| 5 | * - Changes due to Android's toolchain. |
| 6 | * - Changes due to the limitations in Android-based consumer electronics. |
| 7 | * |
| 8 | * Some of them are to-dos. If and when they are done, there will no longer be |
| 9 | * merge conflicts with upstream on those parts. |
| 10 | * |
| 11 | * The file contains useful hints when we try to resolve future 3-way merge |
| 12 | * conflicts. |
| 13 | */ |
| 14 | |
| Shih-wei Liao | e34de79 | 2012-08-15 02:31:08 -0700 | [diff] [blame] | 15 | * For JellyBean: Synced to upstream r155350 |
| Stephen Hines | 6490f0d | 2012-08-23 03:01:53 -0700 | [diff] [blame] | 16 | * For JellyBean MR1: Synced to upstream r162279 |
| Stephen Hines | dd3a5ec | 2013-03-19 21:35:55 -0700 | [diff] [blame] | 17 | * For Jellybean MR2: Synced to upstream r177337 |
| Stephen Hines | 7cba5f1 | 2013-08-08 23:48:34 -0700 | [diff] [blame] | 18 | * For Key Lime Pie: Synced to upstream r187889 |
| Stephen Hines | 21b5c4d | 2014-02-09 02:31:07 -0800 | [diff] [blame] | 19 | * For FUTURE: Synced to LLVM 3.4 r197381 |
| Stephen Hines | 031afa3 | 2012-03-08 14:16:16 -0800 | [diff] [blame] | 20 | |
| Stephen Hines | 21b5c4d | 2014-02-09 02:31:07 -0800 | [diff] [blame] | 21 | * Cherry-pick on 2014/2/11: https://llvm.org/svn/llvm-project/compiler-rt/trunk@201068 and https://llvm.org/svn/llvm-project/compiler-rt/trunk@201070 |
| 22 | * Recent downstreaming on 2013/2/11: Synced to r197381 (Contact srhines for merge questions.) |
| Stephen Hines | 7cba5f1 | 2013-08-08 23:48:34 -0700 | [diff] [blame] | 23 | * Recent downstreaming on 2013/8/8: Synced to r187889 (Contact srhines for merge questions.) |
| Stephen Hines | 485f738 | 2013-06-12 17:07:18 -0700 | [diff] [blame] | 24 | * Recent downstreaming on 2013/6/13: Synced to r183849 (Contact srhines for merge questions.) |
| Stephen Hines | 3a02de3 | 2013-05-03 18:10:06 -0700 | [diff] [blame] | 25 | * Recent downstreaming on 2013/5/3: Synced to r180792 (Contact srhines for merge questions.) |
| Stephen Hines | dd3a5ec | 2013-03-19 21:35:55 -0700 | [diff] [blame] | 26 | * Recent downstreaming on 2013/3/18: Synced to r177337 (Contact srhines for merge questions.) |
| Stephen Hines | ff571e2 | 2013-03-05 23:44:58 -0800 | [diff] [blame] | 27 | * Recent downstreaming on 2013/3/5: Synced to r176091 (Contact srhines for merge questions.) |
| 28 | * Recent downstreaming on 2013/1/8: Synced to r171802 (Contact srhines for merge questions.) |
| Stephen Hines | 6490f0d | 2012-08-23 03:01:53 -0700 | [diff] [blame] | 29 | * Recent downstreaming on 2012/08/23: Synced to r162279 (Contact srhines for merge questions.) |
| Shih-wei Liao | e34de79 | 2012-08-15 02:31:08 -0700 | [diff] [blame] | 30 | * Recent downstreaming on 2012/08/15: Synced to r159129 (Contact sliao for merge questions.) |
| Stephen Hines | 08c058a | 2012-07-27 09:47:37 -0700 | [diff] [blame] | 31 | * Cherry-pick on 2012/07/27: https://llvm.org/svn/llvm-project/compiler-rt/trunk@160853 for ASan (Contact srhines for merge questions.) |
| Stephen Hines | 27590d7 | 2012-05-23 14:32:30 -0700 | [diff] [blame] | 32 | * Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157318 for ASan (Contact srhines for merge questions.) |
| Shih-wei Liao | e34de79 | 2012-08-15 02:31:08 -0700 | [diff] [blame] | 33 | * Recent downstreaming on 2012/04/25: Synced to r155350 (Contact sliao for merge questions.) |
| Stephen Hines | 031afa3 | 2012-03-08 14:16:16 -0800 | [diff] [blame] | 34 | * Recent downstreaming on 2012/03/08: Synced to r152058 (Contact srhines for merge questions.) |
| 35 | |
| 36 | TODO: This is still not building by default (no Android.mk files are present |
| 37 | yet). Look at frameworks/compile/libbcc/runtime for potential starting points. |
| 38 | |
| 39 | TODO: Switch libbcc to use this version of compiler-rt instead of its own |
| 40 | tweaked version. |