summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-4.4.1_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Ricardo Cerqueira2013-12-061-2/+2
|\ | | | | | | Android 4.4.1 Release 1
| * Update default -j argument for generate-blob-listsConley Owens2013-10-161-2/+2
| | | | | | | | | | | | | | People have faster machines now, so we should take advantage of that. This bumps the `make -j` value from 32 to 64. Change-Id: I2db6f048f7c9bbaea84cdfd8a719a50d7d01cc95
| * am 9d87133e: am 6e11de2e: am e7d43e37: am e1b1f641: am ec41323d: am ↵Jean-Baptiste Queru2013-06-210-0/+0
| |\ | | | | | | | | | | | | | | | | | | 6aa21b8c: (-s ours) am f8bd3707: Don\'t track binaries for newer devices * commit '9d87133ef70376f0e8c8fb7eda818ce6f6a9c1d2': Don't track binaries for newer devices
| | * am 6e11de2e: am e7d43e37: am e1b1f641: am ec41323d: am 6aa21b8c: (-s ours) ↵Jean-Baptiste Queru2013-06-210-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am f8bd3707: Don\'t track binaries for newer devices * commit '6e11de2e65ca40f4263bfb785c2ce3f078603d3d': Don't track binaries for newer devices
| | | * am e7d43e37: am e1b1f641: am ec41323d: am 6aa21b8c: (-s ours) am f8bd3707: ↵Jean-Baptiste Queru2013-06-210-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don\'t track binaries for newer devices * commit 'e7d43e375a76d79abb5e9389310752dd106ec5d2': Don't track binaries for newer devices
| | | | * am e1b1f641: am ec41323d: am 6aa21b8c: (-s ours) am f8bd3707: Don\'t track ↵Jean-Baptiste Queru2013-06-210-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binaries for newer devices * commit 'e1b1f6414888ccf3bee8d8b00118cbd8baca663a': Don't track binaries for newer devices
| | | | | * am ec41323d: am 6aa21b8c: (-s ours) am f8bd3707: Don\'t track binaries for ↵Jean-Baptiste Queru2013-06-210-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | newer devices * commit 'ec41323d7acd2eda47e2f6d5c9aa59e34434c06d': Don't track binaries for newer devices
| | | | | | * am 6aa21b8c: (-s ours) am f8bd3707: Don\'t track binaries for newer devicesJean-Baptiste Queru2013-06-210-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6aa21b8cf337c20427b14dd842020a0d1e10d75c': Don't track binaries for newer devices
| | | | | | | * am f8bd3707: Don\'t track binaries for newer devicesJean-Baptiste Queru2013-06-211-1/+1
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8bd37070348368fa4a766303a29e1b5f58f7ca3': Don't track binaries for newer devices
| | | | | | | | * Don't track binaries for newer devicesJean-Baptiste Queru2013-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I03937966536c4d17b373017e6af7224141c4c434
* | | | | | | | | Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-011-6/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 4.4 Release 1.0
| * | | | | | | | Revert "Make script more precise"Jean-Baptiste Queru2013-06-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d50e04a62394cbf5796275c103be7050e68c9399.
| * | | | | | | | am d50e04a6: Make script more preciseJean-Baptiste Queru2013-06-111-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd50e04a62394cbf5796275c103be7050e68c9399': Make script more precise
| * | | | | | | | am 170977f3: Revert "Add robustness against vendor dependencies"Jean-Baptiste Queru2013-05-291-2/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '170977f3baf6e8fbe01eb523894adbbfc8c4c23b': Revert "Add robustness against vendor dependencies"
| * \ \ \ \ \ \ \ \ am 783e2656: Add robustness against vendor dependenciesJean-Baptiste Queru2013-05-281-0/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '783e26565ce5dbd0c56af1a2f3d54cdc41f13a40': Add robustness against vendor dependencies
| * | | | | | | | | | Include device name in change descriptionJean-Baptiste Queru2013-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib40586428053a7ccfb11fa1036a06f8398aeb516
| * | | | | | | | | | Merge from jb-mr2Jean-Baptiste Queru2013-04-151-8/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I259218338d642105d1914a1e3775bddb23493f1e
| * \ \ \ \ \ \ \ \ \ \ am af1d81e4: move libbt to hardware/broadcom/libbtkeunyoung2013-04-1134-3374/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af1d81e4322434fda1ee967e4859697bd949a3b0': move libbt to hardware/broadcom/libbt
| * \ \ \ \ \ \ \ \ \ \ \ am 8743cdb9: Add liblogYing Wang2013-04-091-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8743cdb9214608fe2cbb155afe24629c6d96bcfc': Add liblog
| * | | | | | | | | | | | | Add hammerheadJean-Baptiste Queru2013-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89f6b0be945dc33c5ad3105748702589ffed1957
| * | | | | | | | | | | | | moar devicesJean-Baptiste Queru2013-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I66205b545afd12814eb2c8df11d4a9a20389853d
| * | | | | | | | | | | | | am bb652fd3: Add support for blobs for experimental devicesJean-Baptiste Queru2013-03-281-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bb652fd3a0573e29a0881642b508a3d9dd45cc14': Add support for blobs for experimental devices
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am c1bc4b26: Rename AOSP builds to aosp_*Jean-Baptiste Queru2013-03-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c1bc4b26d3f33d3ef6aa55027bf8b954416dcc29': Rename AOSP builds to aosp_*
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 801131cb: (-s ours) Remove special-case - do not mergeJean-Baptiste Queru2013-03-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '801131cb4142027089d61fb2e5c5701696316144': Remove special-case - do not merge
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9f8c7e1a: Fine-tune device listJean-Baptiste Queru2013-03-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f8c7e1aa208fa0742b23836da5dd87136caa646': Fine-tune device list
| * | | | | | | | | | | | | | | | | Include ALL the projectsJean-Baptiste Queru2013-03-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iddb7a6c92629a98aa7b0e531b59a87cce07f37bc
* | | | | | | | | | | | | | | | | | Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Ricardo Cerqueira2013-07-2439-3546/+307
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 4.3 release 2.1 Conflicts: libbt/include/bt_vendor_brcm.h libbt/src/bt_vendor_brcm.c libbt/src/hardware.c libbt/vnd_buildcfg.mk Change-Id: I25264c7c54be78fe5835f986d78826a023347a84
| * | | | | | | | | | | | | | | | | Make script more preciseJean-Baptiste Queru2013-06-101-0/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove project that has vendor/ dependencies Change-Id: Icbeb1648ebe5af52fb2eaa56837887cb44213c85
| * | | | | | | | | | | | | | | | Revert "Add robustness against vendor dependencies"Jean-Baptiste Queru2013-05-291-2/+0
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 783e26565ce5dbd0c56af1a2f3d54cdc41f13a40 Bug: 6815609 Change-Id: I2225a48133faccf7f08d80100306bbdc33a49eb2
| * | | | | | | | | | | | | | | Add robustness against vendor dependenciesJean-Baptiste Queru2013-05-281-0/+2
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6815609 Change-Id: Ic9346affdab556fffceee03e4748a46c930fab73
| * | | | | | | | | | | | | | Improve generation of lists of proprietary blobs.Jean-Baptiste Queru2013-04-121-5/+2
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamically determine the list of devices. Skip code that doesn't build. Bug: 8596923 Bug: 8608278 Change-Id: I8cb334cb4d16555fe0cb8f802d09169b3996e562
| * | | | | | | | | | | | | move libbt to hardware/broadcom/libbtkeunyoung2013-04-1134-3374/+0
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 8588590 Change-Id: I18eb56ffec0fa5827ffdf35e772a51a738a65893
| * | | | | | | | | | | | Add liblogYing Wang2013-04-091-1/+2
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8580410 Change-Id: Ib99982bdd1bf08a4a11002faa5149f9883209dd6
| * | | | | | | | | | | Add support for blobs for experimental devicesJean-Baptiste Queru2013-03-281-1/+6
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I254c25d5cfba7bf4cba0067ae22b9e0279408cc5
| * | | | | | | | | | Rename AOSP builds to aosp_*Jean-Baptiste Queru2013-03-221-2/+2
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id277a996192d630e25fc1bff89f201ad484a1239
| * | | | | | | | | Remove special-case - do not mergeJean-Baptiste Queru2013-03-041-1/+0
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I277c8c44383920e971888c9040b6544d9228eb91
| * | | | | | | | Fine-tune device listJean-Baptiste Queru2013-03-041-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I19b2e892f38e8f9988696ed25632cb1baeb42928
| * | | | | | | Clean up the cleanup codeJean-Baptiste Queru2013-02-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie07cb1d66d9ed99464fa6854c47cb33fe86ddaa6
| * | | | | | | Add extra devicesJean-Baptiste Queru2013-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2cb9370848deccaf3b668269db4d7d2f76183db
| * | | | | | | am f5e5e760: resolved conflicts for merge of 16e6db4c to jb-mr1-dev-plus-aospJean-Baptiste Queru2013-02-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android Git Automerger (2) and Jean-Baptiste Queru (2) * commit 'f5e5e76065d9dbc6f2334e4bee4af233aaebc14a': Don't delete tilapia files when preparing blob lists.
| | * | | | | | resolved conflicts for merge of 16e6db4c to jb-mr1-dev-plus-aospJean-Baptiste Queru2013-02-041-1/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I33f870d3ce6d7855073526d9910ec15de197fd78
| | | * | | | | am 71e23bec: am 7541807f: Don\'t delete tilapia files when preparing blob lists.Jean-Baptiste Queru2013-02-011-1/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android Git Automerger (1) and Jean-Baptiste Queru (1) * commit '71e23bec393ce3930822c1224ffad80f2918a957': Don't delete tilapia files when preparing blob lists.
| | | | * | | | am 7541807f: Don\'t delete tilapia files when preparing blob lists.Jean-Baptiste Queru2013-02-011-1/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Jean-Baptiste Queru * commit '7541807fddfca8c785c219399e3ffebd375b286e': Don't delete tilapia files when preparing blob lists.
| | | | | * | | Don't delete tilapia files when preparing blob lists.Jean-Baptiste Queru2013-01-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those files are now part of AOSP. Bug: 7252211 Change-Id: I23959df8d22cced134c96c7479becaa608d21562
| * | | | | | | am cd02a63f: am a1e876c0: am 4aaadc56: am fc8a288a: Generate blob list for ↵Jean-Baptiste Queru2013-02-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tilapia. # Via Android Git Automerger (3) and Jean-Baptiste Queru (1) * commit 'cd02a63f3e82d4a40e32feaf231b37245a01b106': Generate blob list for tilapia.
| | * | | | | | am a1e876c0: am 4aaadc56: am fc8a288a: Generate blob list for tilapia.Jean-Baptiste Queru2013-02-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android Git Automerger (2) and Jean-Baptiste Queru (1) * commit 'a1e876c054e608d7f9b014a31f129608e492953c': Generate blob list for tilapia.
| | | * | | | | am 4aaadc56: am fc8a288a: Generate blob list for tilapia.Jean-Baptiste Queru2013-02-010-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android Git Automerger (1) and Jean-Baptiste Queru (1) * commit '4aaadc568182975ede61fe0b1c88dadf942da570': Generate blob list for tilapia.
| | | | * | | | am fc8a288a: Generate blob list for tilapia.Jean-Baptiste Queru2013-02-010-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Jean-Baptiste Queru * commit 'fc8a288a40f60e8eb3f0d8e36de3672ed8f051fe': Generate blob list for tilapia.
| | | | | * | | Generate blob list for tilapia.Jean-Baptiste Queru2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop generating it for mako. Bug: 7252211 Change-Id: I61f726592861527b61b63fe13b350a59afbe1d43
| * | | | | | | am 77059769: am 756dafc3: resolved conflicts for merge of b376b2cc to ↵Jean-Baptiste Queru2013-01-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-aah-dev # Via Jean-Baptiste Queru (2) and Android Git Automerger (1) * commit '77059769ca8f5c20015f521ca8c17e810959183e': Generate blob list for tilapia.