summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
...
* Change version back to 6.0Bart Sears2015-11-151-2/+2
| | | | | | | Temporarily set the version back to 6.0 and security patch to 2015-11-01. Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
* "MMB29K"The Android Automerger2015-11-111-1/+1
|
* "MMB29J"The Android Automerger2015-11-091-1/+1
|
* "MMB29I"The Android Automerger2015-11-091-1/+1
|
* "MMB29H"The Android Automerger2015-11-051-1/+1
|
* "MMB29G"The Android Automerger2015-11-051-1/+1
|
* "MMB29F"The Android Automerger2015-11-041-1/+1
|
* "MMB29E"The Android Automerger2015-11-041-1/+1
|
* "MMB29D"The Android Automerger2015-11-031-1/+1
|
* "MMB29C"The Android Automerger2015-11-021-1/+1
|
* "MMB29B"The Android Automerger2015-10-291-1/+1
|
* "MMB29"The Android Automerger2015-10-291-1/+1
|
* Bump Android to 6.0.1Ian Pedowitz2015-10-221-1/+1
| | | | | Bug: 24777474 Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
* Update security string to 2015-12-01Zach Jang2015-10-191-1/+1
| | | | Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
* Add all-named-(dirs|files)-under and relatedDan Willemsen2015-10-131-34/+50
| | | | | | | | | | | | | | | | | | | | To consolidate the number of places that we're using 'find' in the tree, add some more helpers: all-named-dirs-under all-subdir-named-dirs all-named-files-under all-subdir-named-files This change also makes many of the current helpers use these helpers instead of using their own implementation. The 'dirs' helpers are using '-type d' so that they only output directories. It's probably safe to use '-type f' for the files helpers, but that increased the kati load time by ~20%. Bug: 24204119 Change-Id: I3312e2fe8c146f10955e1d986ad15d9c8be494e1
* Add all-cpp-files-underDan Willemsen2015-10-131-0/+23
| | | | | | | | There are multiple versions of this in the tree. Let's standardize on one that will work for everyone, and will sort the results. Bug: 24204119 Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f
* Sort all files found via $(shell find)Dan Willemsen2015-10-131-23/+23
| | | | | | | Don't rely on filesystem ordering to make these the same for all builds. Bug: 24204119 Change-Id: I7313062157764091acecf45f4b57405c28858546
* Don't add build number to apps' version name for platform build.Ying Wang2015-09-211-6/+10
| | | | | Bug: 24201956 Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
* am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into ↵Zach Jang2015-09-021-1/+1
|\ | | | | | | | | | | | | mnc-dev * commit '057831bc665b15d7beda970b91b2c332dee417f0': Set the Security Patch level with Oct 1 for MNC
| * Set the Security Patch level with Oct 1 for MNCZach Jang2015-08-311-1/+1
| | | | | | | | | | | | | | - MNC currently has security patches from the August OEM bulletin with patch date of Sep 1 plus only critical fixes from September OEM bulletin - To be cherry-picked if picking up remaining fixes from September OEM bulletin to MNC Change-Id: I2d1ba9c5a893727962f3f1837df1dd9df49e44f5
* | Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-devTao Bao2015-09-011-1/+1
|\ \
| * | Revert "Temporarily use blockimgdiff v2 for OTA."Tao Bao2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d07bfc519673fdba66448f0a81ef869b922c3804. Real fixes [1][2][3] are ready to merge. Time to revert the workaround. [1] commit d47d8e14880132c42a75f41c8041851797c75e35 [2] commit 1fc67631eedbfba07e005d85aadae6e1b91d8d93 [3] commit 937847ae493d36b9741f6387a2357d5cdceda3d9 Bug: 22430577 Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
* | | am 8f7c08ed: am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.Ying Wang2015-08-271-0/+1
|\ \ \ | |/ / |/| / | |/ | | * commit '8f7c08ed622d733c0997324d5b0464ba7e57c1fa': Dist the otatools package.
| * am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.Ying Wang2015-08-271-0/+1
| |\ | | | | | | | | | | | | * commit '1e120181f0a9240eca61dface4fb4530bf2594ab': Dist the otatools package.
| | * am 473b6a5f: am fc028e59: Dist the otatools package.Ying Wang2015-08-261-0/+1
| | |\ | | | | | | | | | | | | | | | | * commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609': Dist the otatools package.
| | | * am fc028e59: Dist the otatools package.Ying Wang2015-08-251-0/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd': Dist the otatools package.
| | | | * Dist the otatools package.Ying Wang2015-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23495952 (cherry picked from commit 267e957373765ad1e3ce89abe61886a305277027) Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
| | | * | am 32bf3f32: add otatools-package targetDoug Zongker2015-08-251-0/+24
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9': add otatools-package target
| | | | * add otatools-package targetDoug Zongker2015-08-241-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a target to zip up all the otatools and releasetools, for easy copying to the OTA builder machine. Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563 (cherry picked from commit f22b0f43efbc16c548692dc239a387edda15d78f)
| | * | | Fix conflict resolving error in ef5dc90bba179f774bee0c7e479965cef12091deYing Wang2015-06-261-18/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
* | | | | am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-devBart Sears2015-08-261-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c69aa42b4331569814d23336412e6754a0495d65': Set the Security Patch level for MNC
| * | | | Set the Security Patch level for MNCBart Sears2015-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MNC will include the security patches from the August OEM bulletin which will have a patch date of September 1. Bug: 23288951 Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
* | | | | am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the ↵Chris Banes2015-08-131-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | docs" into mnc-dev * commit '743938fb0d4f56d7d009486fb90891eab9b50897': Make sure only AppCompat (not it's tests) are in the docs
| * | | | Make sure only AppCompat (not it's tests) are in the docsChris Banes2015-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 23169683 Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
* | | | | am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in ↵Dianne Hackborn2015-08-132-0/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Settings" into mnc-dev * commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c': Fix issie #23116383: Include security patch level in Settings
| * | | | Merge "Fix issie #23116383: Include security patch level in Settings" into ↵Dianne Hackborn2015-08-132-0/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | mnc-dev
| | * | | | Fix issie #23116383: Include security patch level in SettingsDianne Hackborn2015-08-122-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
* | | | | | am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0Ian Pedowitz2015-08-111-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a18c5028d77f0323b8b8959982ae7d6b1ec7aded': Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
| * | | | | Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0Ian Pedowitz2015-08-111-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
* | | | | am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4Ian Pedowitz2015-08-111-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '38ffb0cf899d94cb72409519bd25dc94048dd719': Bump PLATFORM_PREVIEW_SDK_VERSION to 4
| * | | | Bump PLATFORM_PREVIEW_SDK_VERSION to 4Ian Pedowitz2015-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
* | | | | Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" ↵Furquan Shaikh2015-08-092-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mnc-dr-dev
| * | | | | vboot_signer: Add kernel subkey required for signing kernel keyblockFurquan Shaikh2015-08-072-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the keyblock was being generated using data_key.vbprivk. However, we need to use kernel_subkey.vbprivk for kernel keyblock generation. This did not create any issues until now because dev-mode just throws a message saying that keyblock is invalid. But, normal-mode does not boot if keyblock is invalid. Add extra parameter for passing in kernel subkey to vboot_signer script. TEST="make bootimage-nodeps" generates correctly signed boot.img. Verified that the image boots fine in normal mode. Change-Id: I0fc2183b466e34ddf1d98c9532072548504fcec4 Signed-off-by: Furquan Shaikh <furquan@google.com>
* | | | | | am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-devYusuf Ozuysal2015-08-071-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '736463f86cbe4a5d6b1b9333ee0eab4f9ebd5a70': Add support-customtabs to the doc build.
| * | | | | Merge "Add support-customtabs to the doc build." into mnc-devYusuf Ozuysal2015-08-071-1/+2
| |\ \ \ \ \
| | * | | | | Add support-customtabs to the doc build.Benoit Lize2015-07-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/22795013 Change-Id: I1363e5136ca15ea3089040d59de528c877fb53df
* | | | | | | am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.Ying Wang2015-08-031-12/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '66c8e8c756fb1790cac792b32ba2de057c3b1b4e': Don't prepend CC_WRAPPER to CLANG.
| * | | | | | Don't prepend CC_WRAPPER to CLANG.Ying Wang2015-08-031-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have deferred the CC_WRAPPER prepending to binary.mk per module. Bug: 22612634 Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
* | | | | | | am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-devDianne Hackborn2015-07-311-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '56866c4d0e31bbc65e333754bb69accb2b0f4a36': Remove M codename, version number is 6.0.
| * | | | | | Merge "Remove M codename, version number is 6.0." into mnc-devDianne Hackborn2015-07-311-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
generated by cgit v1.1 at 2024-12-24 05:53:19 +0000