cubieboard / openbox_external_clang Goto Github PK

/*
 * README.android describes in high-level the LLVM changes that we cannot push
 * upstream to the llvm.org repository:
 *  - Changes due to Android's build system.
 *  - Changes due to Android's toolchain.
 *  - Changes due to the limitations in Android-based consumer electronics.
 *
 * Some of them are to-dos. If and when they are done, there will no longer be
 * merge conflicts with upstream on those parts.
 *
 * The file contains useful hints when we try to resolve future 3-way merge
 * conflicts.
 */

* For Honeycomb: Synced to upstream r112347
* For Honeycomb MR1: Synced to upstream r119349
* For Honeycomb MR2: Synced to upstream r119349
* For Ice Cream Sandwich: Synced to upstream r135574
* For Ice Cream Sandwich MR1: Synced to upstream r142531

* Recent downstreaming on 2011/10/22: From r135574 to r142531 (sliao & logan for merge questions)
* Recent downstreaming on 2011/7/21: From r135359 to r135574 (sliao & logan for merge questions)
* Recent downstreaming on 2011/7/18: From r134305 to r135359 (sliao for merge questions)
* Recent downstreaming on 2011/7/2: From r133721 to r134305 (sliao for merge questions)
* Recent downstreaming on 2011/6/30: From r133163 to r133721 (sliao for merge questions)
* Recent downstreaming on 2011/6/22: From r129173 to r133163 (sliao for merge questions)
* Recent downstreaming on 2011/4/8: From r127120 to r129173 (sliao for merge questions)
* Recent downstreaming on 2011/3/11: From r119349 to r127120 (sliao for merge questions)

* We add Android's *.mk files that are specific to Android's build system.

* Changes for enabling both host and device builds.