1 /* 2 * README.android describes in high-level the LLVM changes that we cannot push 3 * 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 15 * For Honeycomb: Synced to upstream r112347 16 * For Honeycomb MR1: Synced to upstream r119349 17 * For Honeycomb MR2: Synced to upstream r119349 18 * For Ice Cream Sandwich: Synced to upstream r135574 19 20 * Recent downstreaming on 2011/7/21: From r135359 to r135574 (sliao & logan for merge questions) 21 * Recent downstreaming on 2011/7/18: From r134305 to r135359 (sliao for merge questions) 22 * Recent downstreaming on 2011/7/2: From r133721 to r134305 (sliao for merge questions) 23 * Recent downstreaming on 2011/6/30: From r133163 to r133721 (sliao for merge questions) 24 * Recent downstreaming on 2011/6/22: From r129173 to r133163 (sliao for merge questions) 25 * Recent downstreaming on 2011/4/8: From r127120 to r129173 (sliao for merge questions) 26 * Recent downstreaming on 2011/3/11: From r119349 to r127120 (sliao for merge questions) 27 28 * We add Android's *.mk files that are specific to Android's build system. 29 30 * Changes for enabling both host and device builds. 31 32
