1*7c3d14c8STreehugger Robot/* 2*7c3d14c8STreehugger Robot * README.android describes in high-level the compiler-rt changes that we 3*7c3d14c8STreehugger Robot * cannot push upstream to the llvm.org repository: 4*7c3d14c8STreehugger Robot * - Changes due to Android's build system. 5*7c3d14c8STreehugger Robot * - Changes due to Android's toolchain. 6*7c3d14c8STreehugger Robot * - Changes due to the limitations in Android-based consumer electronics. 7*7c3d14c8STreehugger Robot * 8*7c3d14c8STreehugger Robot * Some of them are to-dos. If and when they are done, there will no longer be 9*7c3d14c8STreehugger Robot * merge conflicts with upstream on those parts. 10*7c3d14c8STreehugger Robot * 11*7c3d14c8STreehugger Robot * The file contains useful hints when we try to resolve future 3-way merge 12*7c3d14c8STreehugger Robot * conflicts. 13*7c3d14c8STreehugger Robot */ 14*7c3d14c8STreehugger Robot 15*7c3d14c8STreehugger Robot* For JellyBean: Synced to upstream r155350 16*7c3d14c8STreehugger Robot* For JellyBean MR1: Synced to upstream r162279 17*7c3d14c8STreehugger Robot* For Jellybean MR2: Synced to upstream r177337 18*7c3d14c8STreehugger Robot* For Key Lime Pie: Synced to upstream r187889 19*7c3d14c8STreehugger Robot* For FUTURE: Synced to LLVM 3.4 r197381 20*7c3d14c8STreehugger Robot 21*7c3d14c8STreehugger Robot* 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*7c3d14c8STreehugger Robot* Recent downstreaming on 2013/2/11: Synced to r197381 (Contact srhines for merge questions.) 23*7c3d14c8STreehugger Robot* Recent downstreaming on 2013/8/8: Synced to r187889 (Contact srhines for merge questions.) 24*7c3d14c8STreehugger Robot* Recent downstreaming on 2013/6/13: Synced to r183849 (Contact srhines for merge questions.) 25*7c3d14c8STreehugger Robot* Recent downstreaming on 2013/5/3: Synced to r180792 (Contact srhines for merge questions.) 26*7c3d14c8STreehugger Robot* Recent downstreaming on 2013/3/18: Synced to r177337 (Contact srhines for merge questions.) 27*7c3d14c8STreehugger Robot* Recent downstreaming on 2013/3/5: Synced to r176091 (Contact srhines for merge questions.) 28*7c3d14c8STreehugger Robot* Recent downstreaming on 2013/1/8: Synced to r171802 (Contact srhines for merge questions.) 29*7c3d14c8STreehugger Robot* Recent downstreaming on 2012/08/23: Synced to r162279 (Contact srhines for merge questions.) 30*7c3d14c8STreehugger Robot* Recent downstreaming on 2012/08/15: Synced to r159129 (Contact sliao for merge questions.) 31*7c3d14c8STreehugger Robot* Cherry-pick on 2012/07/27: https://llvm.org/svn/llvm-project/compiler-rt/trunk@160853 for ASan (Contact srhines for merge questions.) 32*7c3d14c8STreehugger Robot* Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157318 for ASan (Contact srhines for merge questions.) 33*7c3d14c8STreehugger Robot* Recent downstreaming on 2012/04/25: Synced to r155350 (Contact sliao for merge questions.) 34*7c3d14c8STreehugger Robot* Recent downstreaming on 2012/03/08: Synced to r152058 (Contact srhines for merge questions.) 35*7c3d14c8STreehugger Robot 36*7c3d14c8STreehugger RobotTODO: This is still not building by default (no Android.mk files are present 37*7c3d14c8STreehugger Robotyet). Look at frameworks/compile/libbcc/runtime for potential starting points. 38*7c3d14c8STreehugger Robot 39*7c3d14c8STreehugger RobotTODO: Switch libbcc to use this version of compiler-rt instead of its own 40*7c3d14c8STreehugger Robottweaked version. 41