README.android revision 6490f0d0b9a761083016aa469c9cce72b341b0a4
1031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines/* 2031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * README.android describes in high-level the compiler-rt changes that we 3031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * cannot push upstream to the llvm.org repository: 4031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * - Changes due to Android's build system. 5031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * - Changes due to Android's toolchain. 6031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * - Changes due to the limitations in Android-based consumer electronics. 7031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * 8031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * Some of them are to-dos. If and when they are done, there will no longer be 9031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * merge conflicts with upstream on those parts. 10031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * 11031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * The file contains useful hints when we try to resolve future 3-way merge 12031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * conflicts. 13031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines */ 14031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines 15e34de791db1e32f0e228a4c82d4a28cce79b0a79Shih-wei Liao* For JellyBean: Synced to upstream r155350 166490f0d0b9a761083016aa469c9cce72b341b0a4Stephen Hines* For JellyBean MR1: Synced to upstream r162279 17031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines 186490f0d0b9a761083016aa469c9cce72b341b0a4Stephen Hines* Recent downstreaming on 2012/08/23: Synced to r162279 (Contact srhines for merge questions.) 19e34de791db1e32f0e228a4c82d4a28cce79b0a79Shih-wei Liao* Recent downstreaming on 2012/08/15: Synced to r159129 (Contact sliao for merge questions.) 2008c058a8b62f3661d38c09c8893f2c082fca949eStephen Hines* Cherry-pick on 2012/07/27: https://llvm.org/svn/llvm-project/compiler-rt/trunk@160853 for ASan (Contact srhines for merge questions.) 2127590d73e7a656b92ed5789172a38468ce7b615eStephen Hines* Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157318 for ASan (Contact srhines for merge questions.) 22e34de791db1e32f0e228a4c82d4a28cce79b0a79Shih-wei Liao* Recent downstreaming on 2012/04/25: Synced to r155350 (Contact sliao for merge questions.) 23031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines* Recent downstreaming on 2012/03/08: Synced to r152058 (Contact srhines for merge questions.) 24031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines 25031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen HinesTODO: This is still not building by default (no Android.mk files are present 26031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hinesyet). Look at frameworks/compile/libbcc/runtime for potential starting points. 27031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines 28031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen HinesTODO: Switch libbcc to use this version of compiler-rt instead of its own 29031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hinestweaked version. 30