summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch ↵Dianne Hackborn2015-08-131-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | level in Settings" into mnc-dev * commit '897f3ba8b1cc402fca16720be345ba9c587c326b': Fix issie #23116383: Include security patch level in Settings
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in ↵Clay Murphy2015-08-112-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev * commit '86e510cc313a464870ff82a9cd7f7206ea4aeb63': Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9f5c487e: Merge "releasetools: Fix parameters for vboot_signer" into ↵Furquan Shaikh2015-08-101-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '9f5c487ef586d20c273cafba6ce663287ef6a37a': releasetools: Fix parameters for vboot_signer
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 15b42c42: am cce673b6: Read fstab from the source build.Tao Bao2015-07-291-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '15b42c426715c2221f49d0cf2181ba869b84bc94': Read fstab from the source build.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7f8ecb7f: Merge "Zero out blocks that may be touched by dm-verity." into ↵Tao Bao2015-07-104-14/+73
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '7f8ecb7f5c21630a75c69d170ba2b401d7a311a5': Zero out blocks that may be touched by dm-verity.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 74a81e66: fix device specific fs_config on build serverThierry Strudel2015-07-104-11/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74a81e6633276d92337749a5ee9d921207814dd4': fix device specific fs_config on build server
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 610754e5 to cw-e-devTao Bao2015-07-081-6/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia0d0d82c7fec86e1585a9e2c90ac877c363ed491
| | | * | | | | | | | | | | | | | | | | | | | | | | Scan all init.*.rc files for flash_recovery service.Tao Bao2015-07-071-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clockwork builds may rename init.rc to init.core.rc. Change the OTA script to scan all init.*.rc files to determine the proper location for install-recovery.sh. Bug: 22128990 Change-Id: If96bd0b81090683ad0bbfddb735d390204849d9f
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into ↵Chris Elliott2015-07-021-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cw-d-mr1-dev
| | | | * | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Fix the syntax error in the edify script generatorTao Bao2015-07-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file_getprop() always expects two arguments. Bug: 19881931 Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
| * | | | | | | | | | | | | | | | | | | | | | | | | | releasetool: add OSIP partitions specificsArtefvck 072016-02-202-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Declare OSIP as a new partition type - Standard boot.img update is not possible for OSIP partitions We are simply removing it on AOSP handling, and let the board handle it in its own releasetool.py Change-Id: Ie19fc3f6a0ca42e2eda264904b20fceeddbeaf53
| * | | | | | | | | | | | | | | | | | | | | | | | | | ota_from_target_files: Don't validate data signatures with data wipeBrint E. Kriebel2016-02-161-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If data is going to be wiped later in the script, there is no reason to validate signatures. This breaks updates that may be designed to wipe data and change signatures. Change-Id: I0b794b43cec2d22996eaa5571688c66582475d55 Ticket: CYNGNOS-1289
| * | | | | | | | | | | | | | | | | | | | | | | | | | releasetools: Store the proper base64 release key in the target filesBrint E. Kriebel2016-02-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was dropped when the original change (I7528a8e7c484ea9209cd665b9263328ae834586a) was cherry-picked into 13.0. Add it back in to the sign_target_files_apks.py file. Change-Id: I0177a7d2a39ae03b21d0b2b4ad48a621ca5afd7b Ticket: CYNGNOS-2067
| * | | | | | | | | | | | | | | | | | | | | | | | | | repopick: Don't crash if change not foundMatt Mower2016-02-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If change is not located, skip it. Resolves the following: Traceback (most recent call last): File "(omitted)/build/tools/repopick.py", line 258, in <module> review = [x for x in reviews if x['number'] == change][0] IndexError: list index out of range Change-Id: I96423ddc809ac1c7994998db4e1929ca813f20ca
| * | | | | | | | | | | | | | | | | | | | | | | | | | releasetools: Don't extract BOOTABLE_IMAGES when signing target filesBrint E. Kriebel2016-02-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boot and recovery images need to be re-created during the signing process to ensure that the proper keys are embedded in the images. Don't extract the BOOTABLE_IMAGES path if it exists in the source target files to avoid re-using the prebuilt versions. Change-Id: Icdf61367efc2364f89c7ab1c61a81536431aea2e Ticket: CYNGNOS-1994
* | | | | | | | | | | | | | | | | | | | | | | | | | | releasetools: Store the proper base64 release key in the target filesBrint E. Kriebel2016-02-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was dropped when the original change (I7528a8e7c484ea9209cd665b9263328ae834586a) was cherry-picked into 13.0. Add it back in to the sign_target_files_apks.py file. Change-Id: I0177a7d2a39ae03b21d0b2b4ad48a621ca5afd7b Ticket: CYNGNOS-2067
* | | | | | | | | | | | | | | | | | | | | | | | | | | releasetools: Don't extract BOOTABLE_IMAGES when signing target filesBrint E. Kriebel2016-02-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boot and recovery images need to be re-created during the signing process to ensure that the proper keys are embedded in the images. Don't extract the BOOTABLE_IMAGES path if it exists in the source target files to avoid re-using the prebuilt versions. Change-Id: Icdf61367efc2364f89c7ab1c61a81536431aea2e Ticket: CYNGNOS-1994
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_build into ↵Wolfgang Wiedmeyer2016-02-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replicant-6.0 Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
| * | | | | | | | | | | | | | | | | | | | | | | | | | releasetools: Replace key values in permission files during re-signingBrint E. Kriebel2016-02-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permission files may grant permissions based on signatures in the same way mac_permissions grants selinux permissions. In order to have this work properly with dev-key and production key signed builds, allow these files to be re-written during the signing process to replace the value of the keys in production signed builds. Change-Id: Id0311e49f8bba5a9f71b2fa49b480cb74779c853 Ticket: CYNGNOS-1877, RM-179
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_build into ↵Wolfgang Wiedmeyer2016-02-034-24/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replicant-6.0 Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
| * | | | | | | | | | | | | | | | | | | | | | | | | | roomservice: check uniqueness by path, not nameArnav Gupta2016-02-011-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For repos such as hardware/qcom/media-caf we are using the same name with different branches for different paths. for eg. CyanogenMod/hardware_qcom_media-caf(branch:8994) - fetch to : /hardware/qcom/media-caf/8994 CyanogenMod/hardware_qcom_media-caf(branch:8960) - fetch to : /hardware/qcom/media-caf/8960 For such cases roomservice won't pick up a new path if one already exists. We should check for unique by target path instead. Change-Id: I89e561ca9a2d57ede8cf782f431a8e829ea47ee5 Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
| * | | | | | | | | | | | | | | | | | | | | | | | | | releasetools: add compatibility for full ota functions with incrementalsBrint E. Kriebel2016-01-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some device-specific releasetool functions may expect that input_zip and input_version are set. For incremental OTAs, target_zip and target_version are set instead. Set input_zip=target_zip and input_version=target_version to add compatibility with these functions. Change-Id: I6a04f67440618d3652396656cc1fe223d4a6b195 Ticket: RM-82
| * | | | | | | | | | | | | | | | | | | | | | | | | | releasetools: Use the first entry of a mount point when reading fstabBrint E. Kriebel2016-01-291-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There may be multiple entries in fstab for a mount point. Use the first value found so the entries are prioritized in order. Change-Id: Ibd2631413d3e00507d3a0ec84fb91755f1c7993c Ticket: OPO-326
| * | | | | | | | | | | | | | | | | | | | | | | | | | releasetools: Store and use the dt image file through target filesBrint E. Kriebel2016-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Target files packages may be used for signing images separate from the build process. Store the device tree image file in the target files package so it can be used during the signing process. Change-Id: Ie8507121fa9c4ba57ecffeab05bd859ae5f5b788 Ticket: CYNGNOS-1744
| * | | | | | | | | | | | | | | | | | | | | | | | | | If a console doesn't exist, read password from stdin.adattatr2016-01-261-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When signapk.jar is invoked by scripts like sign_target_files_apks.py, there is no console as signapk is invoked using popen(). To support signing of APKs using software keys with passwords, we need to read the password from stdin if there is no console. Change-Id: Icf69ba1e58bf1f91979eaf1d3b91cb202782e8fd Signed-off-by: adattatr <anisha.dattatraya.kulkarni@intel.com> Signed-off-by: Brad Geltz <brad.geltz@intel.com> Ticket: CYNGNOS-1725
| * | | | | | | | | | | | | | | | | | | | | | | | | | Revert "roomservice: check uniqueness by path, not name"Ethan Chen2016-01-251-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c5ef7f3284bd22f714b178038e42d838b275ade9. Change-Id: I9a3cad3525a0ab8478343a346c68b258e3cbe120
| * | | | | | | | | | | | | | | | | | | | | | | | | | roomservice: check uniqueness by path, not nameArnav Gupta2016-01-251-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For repos such as hardware/qcom/media-caf we are using the same name with different branches for different paths. for eg. CyanogenMod/hardware_qcom_media-caf(branch:8994) - fetch to : /hardware/qcom/media-caf/8994 CyanogenMod/hardware_qcom_media-caf(branch:8960) - fetch to : /hardware/qcom/media-caf/8960 For such cases roomservice won't pick up a new path if one already exists. We should check for unique by target path instead. Change-Id: I0a97b48ccefc5e1e3dbee803bdbcf554db2c3fc9 Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_build into ↵Wolfgang Wiedmeyer2016-01-1431-369/+503
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replicant-6.0-toolchain
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: ota_from_target_files.py: fix logic that brokeAnthony King2016-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I032097c463598d1246feb92c02567175a65f90fd
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: update releasetools with proper print syntaxTom Powell2016-01-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48534a72e6559f60af5f9b1c09040b34b7575b63
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: update all the thingsAnthony King2016-01-0430-292/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e11b46b7c2f7f8760d6c0e713ca99c1e88b7cd3
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: post_process_propsAnthony King2016-01-041-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf7ed5daa4eaa88f5421c798862ea6bb09593cdc
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: java-event-log-tagsAnthony King2016-01-041-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0bf4cbe990c21b6d57e54e96ea62c56ca2d41b86
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: java-layersAnthony King2016-01-041-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3759aa6e25e06dfe7604fc1580ee3060175c485
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: product_debugAnthony King2016-01-041-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4a1e25753a9addd199f148e7eec883b3d9ea337a
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: merge-event-log-tagsAnthony King2016-01-041-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I875d48c67efa129e800bcc834f41d39fc25a62e4
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: compare_filelistAnthony King2016-01-041-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If44ecbf8b09732f3da72b2ade9c6172dd30e58c3
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: parsedepsAnthony King2016-01-041-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a1df87da284e771eeca65c44ab91f88aaab5c80
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: filter-product-graphAnthony King2016-01-041-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f028e054f8b261b486d152b57d6a97bfb9c42af
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: fileslistAnthony King2016-01-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id80525a2aebb361b8cd178c02861f370ecae91eb
| * | | | | | | | | | | | | | | | | | | | | | | | | | py3: repopickAnthony King2016-01-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I65e6bb295bd475cc391579023940642b5747f521
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'cyanogenmod/cm-13.0' into replicant-6.0Wolfgang Wiedmeyer2015-12-211-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | repopick: Allow commits to be excluded from a topic importationAdrianDC2015-12-191-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add the ability to 'repopick -t TOPIC -e 120586,120587' Change-Id: Ib99c095174a0987f68cb8261b7af3f59272b05b5 Signed-off-by: AdrianDC <radian.dc@gmail.com>
* | | | | | | | | | | | | | | | | | | | | | | | | | | Initial Replicant 4.2 commitPaul Kocialkowski2015-12-151-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I69b539d5a87304d53b62d112d6895fd36bfc6446 Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Conflicts: envsetup.sh tools/device/cm.mk.template
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-075-5/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/build into cm-13.0 Android 6.0.1 release 3 Change-Id: Ifd951be596daad53785b191ddce316a6a4a96e03
| * | | | | | | | | | | | | | | | | | | | | | | | | am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.Tao Bao2015-10-172-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e09359abc0f8c29fbb16d35ab7375d80fde6f931': DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
| | * | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.Tao Bao2015-10-162-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building incremental packages, the info_dict from the source build should be the one in use. We have done that for most of the partitions (system and etc.), and should pass that to vendor's script as well. Also includes the CL in commit aac4ad56b6c60e271d807604b20f72084c58b426 that fixes a bug in commit 6f0b219ac551710c724e3f344023943178cdc217. Bug: 24898607 Change-Id: I4ea6037dad7061e1683661fc4c394fa3a7a7c5cd (cherry picked from commit 6f0b219ac551710c724e3f344023943178cdc217)
| * | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Only use a fixed timestamp when packaging.Tao Bao2015-10-122-0/+20
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL changes to use a fixed timestamp only when packaging into the target_files zip. Bug: 24377993 Change-Id: I01d136f4b99e1eff80c559192d93db83a3c5c0a4 (cherry picked from commit 822f5840c0f498e33829a0a00f383d9be3a7e913)
| * | | | | | | | | | | | | | | | | | | | | | | | am b16edb5f: Merge "add unique ID to each windows download link. These IDs ↵Joe Fernandez2015-10-091-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev * commit 'b16edb5f3ef9032b7e19c29aac2496c34bb8ac76': add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
| | * | | | | | | | | | | | | | | | | | | | | | Merge "add unique ID to each windows download link. These IDs are necessary ↵Joe Fernandez2015-10-091-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the TOS wall to identify which link should be applied to the download button." into mnc-dev