summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Only include RS prebuilts in unbundled branches, not PDK.Tim Murray2013-02-041-44/+55
| | | | Change-Id: I6d3dbcfee075093ffef9ec88fb11a27922342762
* Fix PDK build break.Tim Murray2013-02-041-5/+5
| | | | Change-Id: Ib47f5495f5d97189818ec4c975802eb241336538
* Attempt #2: Unbundled RS compatibility library supportTim Murray2013-02-0111-0/+94
| | | | | Bug: 7419958 Change-Id: I03ba956f56eebcf894f4e51d07592e5282a30453
* Revert "Unbundled RS compatibility library support"Stephen Hines2013-01-2311-94/+0
| | | | | | This reverts commit 86e4bd059d32d4689c90dc49dd122203a458b56f Change-Id: Ia52aeedf71d5f77551b54a6bbc46e08012045984
* Unbundled RS compatibility library supportStephen Hines2013-01-2211-0/+94
| | | | | | Bug: 7419958 Change-Id: I92e61a6ff3e2e1f0d7cb1dbec6f4f29db0962e2b
* Update current SDK as of build #556245 in master.Ying Wang2013-01-101-0/+0
| | | | Change-Id: I4e4e75c49574e6b2fb4383189ca7180f29330965
* Update renderscript to build AAQ07 #553727 in master-release.Ying Wang2013-01-0741-326/+4471
| | | | Change-Id: Ida2f6cd58b8632297372665899ec8f24d0e04e9e
* Drop prebuilt current SDK as of build #547874 in master.Ying Wang2012-12-141-0/+0
| | | | Change-Id: I03e02d89d1d2f0ea998c132b8a42186ef608635d
* Move numeric api files from frameworks/base to prebuilts/sdkYing Wang2012-12-0417-0/+5230707
| | | | | | | | So they can be used in unbundled builds. Bug: 7296240 Change-Id: Ie8825e6f0a3b1605b945e624871e0a6c71435038
* am eb754fc0: (-s ours) am ca49f477: (-s ours) Merge jb-mr1-dev into ↵The Android Open Source Project2012-11-270-0/+0
|\ | | | | | | | | | | aosp/master - do not merge * commit 'eb754fc01b4e1f1a664ddbe375d56f624a053d19':
| * am ca49f477: (-s ours) Merge jb-mr1-dev into aosp/master - do not mergeThe Android Open Source Project2012-11-270-0/+0
| |\ | | | | | | | | | * commit 'ca49f4773d273ca7ceba084aeecea9f30a13ae5f':
| | * Merge jb-mr1-dev into aosp/master - do not mergeThe Android Open Source Project2012-11-273-0/+51
| | |\ | | | | | | | | | | | | Change-Id: Ia5d4285f39b774c56887f3209bc7db53a4c544b3
* | | \ am 350b4e9c: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-140-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '350b4e9ce2844a5c3a5c1fb73e5738f0622e49e9':
| * | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-140-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Ie11bc98347697a21a3cb79d5da8138b8e7bebb32
| | * \ \ merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-140-0/+0
| | |\ \ \
* | | \ \ \ am c15624c7: am 1450c47b: am 5243f864: am 07a523b2: Drop official SDK 17Ying Wang2012-11-133-0/+51
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c15624c76286a15d127136306f53f1105a9ccc51': Drop official SDK 17
| * | | | | am 1450c47b: am 5243f864: am 07a523b2: Drop official SDK 17Ying Wang2012-11-133-0/+51
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '1450c47ba8cf327d9681eb34fda0754feb208ff9': Drop official SDK 17
| | * | | | am 5243f864: am 07a523b2: Drop official SDK 17Ying Wang2012-11-133-0/+51
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '5243f8644fb4ae67a84df877b585ba4d75d0a733': Drop official SDK 17
| | | * | | am 07a523b2: Drop official SDK 17Ying Wang2012-11-133-0/+51
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | * commit '07a523b280d10a10b5c093c52135a63efb3cdb8a': Drop official SDK 17
| | | | * | Drop official SDK 17Ying Wang2012-11-133-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SDK was downloaded with the Eclipse Android SDK Manager. Change-Id: Ieb26ff03da08fae8a690fc1eb46549bcbe937233
* | | | | | am 7b8eccfd: (-s ours) am d3ef8914: am a11e2d20: Reconcile with ↵The Android Open Source Project2012-11-080-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit '7b8eccfd128bee09c660e0e2110e43307189e2fa':
| * | | | | am d3ef8914: am a11e2d20: Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-080-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | * commit 'd3ef89148cde944aa1b02a2e8410168a9695e208':
| | * | | | am a11e2d20: Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | * commit 'a11e2d207e2e5d3a6d4cdd7c7a90f3c16348608d':
| | | * | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbd824035d7ad55843d56d085c0dc90553aa71ad
| | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-060-0/+0
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
* | | | | | | am bc744470: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | * commit 'bc74447080e16c3171229231021ad5ee217b690c':
| * | | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | Change-Id: I85d65e59a36ccffb027cd67848a2aebdf3cfdfe0
| | * | | | | merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-060-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am 08ea3b10: (-s ours) am 5535a9e9: am 8a1238b6: Reconcile with ↵The Android Open Source Project2012-11-060-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-factory-release jb-mr1-release - do not merge * commit '08ea3b10b482d4d08e59e03291d2feb3b361500d':
| * | | | | | | am 5535a9e9: am 8a1238b6: Reconcile with jb-mr1-factory-release ↵The Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit '5535a9e9806775dd09279e9fe415565ced30f3ae':
| | * | | | | | am 8a1238b6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '8a1238b6ba241b784ead62f8cb3e2ab9998e4782': Use prebuilts for PDK build.
| | | | | | | |
| | | | \ \ \ \
| | | *-. \ \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | | |\ \ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | | | | | | | | | | | Change-Id: I87459602566f8cf22c032a4f279c8ef023c83b71
* | | | | | | | | am 26f928ce: (-s ours) am 062f3c13: am 94d1dc58: am bfb25615: (-s ours) [DO ↵Ying Wang2012-11-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release * commit '26f928cebc20dbe74f8fcadb42d9fbe68d88ea8a': [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release
| * | | | | | | | am 062f3c13: am 94d1dc58: am bfb25615: (-s ours) [DO NOT MERGE]Drop current ↵Ying Wang2012-11-060-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK as of JOP36 #524024 from jb-mr1-release * commit '062f3c1386a590822cd411c4be802955a64c8647': [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release
| | * | | | | | | am 94d1dc58: am bfb25615: (-s ours) [DO NOT MERGE]Drop current SDK as of ↵Ying Wang2012-11-060-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JOP36 #524024 from jb-mr1-release * commit '94d1dc587264b19b93b52d560023aafd85dfa13b': [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release
| | | * | | | | | am bfb25615: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP36 #524024 ↵Ying Wang2012-11-060-0/+0
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | from jb-mr1-release * commit 'bfb25615b4980b73f11ae900337b75ffdbc302e6': [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release
| | | | * | | | [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-releaseYing Wang2012-11-061-0/+0
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I37382048281f1f3fb933923f6698ed3f1795473b
* | | | | | | am 4fdc57e3: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | * commit '4fdc57e33a7e06fe2f62d0d986933a7fc1ced378':
| * | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-050-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | Change-Id: I4b74d2eaaf4c3d80493ae2f73ffde05bc9a0c381
| | * | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-030-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| |
* | | | | | am d270339f: (-s ours) am 11416fc8: am 118e3fd9: (-s ours) [DO NOT ↵Ying Wang2012-11-020-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE]Drop current SDK as of JOP32C #522705 from jb-mr1-release * commit 'd270339f90c948c29d4346ec7e263694daa0a346': [DO NOT MERGE]Drop current SDK as of JOP32C #522705 from jb-mr1-release
| * | | | | am 11416fc8: am 118e3fd9: (-s ours) [DO NOT MERGE]Drop current SDK as of ↵Ying Wang2012-11-020-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | JOP32C #522705 from jb-mr1-release * commit '11416fc82da09abb7b2743a09091e0b2425e05b0': [DO NOT MERGE]Drop current SDK as of JOP32C #522705 from jb-mr1-release
| | * | | | am 118e3fd9: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP32C #522705 ↵Ying Wang2012-11-020-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from jb-mr1-release * commit '118e3fd9b12bc5649b612930c4666a72ea508bde': [DO NOT MERGE]Drop current SDK as of JOP32C #522705 from jb-mr1-release
| | | * | | [DO NOT MERGE]Drop current SDK as of JOP32C #522705 from jb-mr1-releaseYing Wang2012-11-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia946b573869397aede65cd12bd59d2dbe9b43ce9
* | | | | | am 81d97c81: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-020-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '81d97c8131d4abc56c12663d70d505e581f11476':
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-020-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I73718e42a2afb6ee8fec129ee89b49070af39b8d
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-010-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | am 08709468: (-s ours) am e18dddfc: am dae9c8c3: (-s ours) [DO NOT MERGE] ↵Ying Wang2012-11-010-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop current SDK as of build JOP31 #520834 from jb-mr1-release. * commit '08709468a670dd4fe85d3a2a03f3aebfd6297476': [DO NOT MERGE] Drop current SDK as of build JOP31 #520834 from jb-mr1-release.
| * | | | | am e18dddfc: am dae9c8c3: (-s ours) [DO NOT MERGE] Drop current SDK as of ↵Ying Wang2012-11-010-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | build JOP31 #520834 from jb-mr1-release. * commit 'e18dddfc411cd96378e58f2cb1c4c451e2d045cf': [DO NOT MERGE] Drop current SDK as of build JOP31 #520834 from jb-mr1-release.
| | * | | | am dae9c8c3: (-s ours) [DO NOT MERGE] Drop current SDK as of build JOP31 ↵Ying Wang2012-11-010-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #520834 from jb-mr1-release. * commit 'dae9c8c3a5cf9b0d1ffc8c277e2054e77edeadaa': [DO NOT MERGE] Drop current SDK as of build JOP31 #520834 from jb-mr1-release.
generated by cgit v1.1 at 2025-03-23 14:56:25 +0000