summaryrefslogtreecommitdiffstats
path: root/core/Makefile
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Store the path to the ota file generator where it can be reusedRicardo Cerqueira2015-10-061-0/+1
| | | | | | | | | | | | Change-Id: I8896713c79a751b79fbbcc75f6ba30dad4ea9fac
* | | build: Don't run backuptool on GMS buildsSteve Kondik2015-10-061-0/+4
| | | | | | | | | | | | Change-Id: I5dde27f9d16b88049171db9805221d92e67f3e5d
* | | Sign final packages with a different key if requestedRicardo Cerqueira2015-10-061-0/+8
| | | | | | | | | | | | | | | | | | ...and throw it into recovery builds as well Change-Id: Ic96d4d49d821cb03d5318e3e9ad93d02fb92573e
* | | add adb to the disttoolsKoushik Dutta2015-10-061-0/+1
| | | | | | | | | | | | Change-Id: I898fa5c9396606144e57dba8453f476b9e9440ab
* | | Revert "bacon: name the package correctly"Ricardo Cerqueira2015-10-061-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 724feedbd9e668e239e827b974437da85c140313. This breaks package naming, since a build.prop from a previous build can be present before the cleanup rules apply, and this is variable is generated before the build actually begins. Most notably, this happens in jenkins with consecutive builds, even if from different projects and tags.
* | | bacon: name the package correctlyChirayu Desai2015-10-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable CM_VERSION gets updated each build, but the actual ro.cm.version in the build.prop doesn't on incremental builds. Name the 'bacon' package according to cm version from the build.prop (if it exists), so that the actual version and the name of the zip stay in sync. Change-Id: I2dacfbbf2ae418945a9b37fef2fd7cbd31510e26
* | | bacon: get rid of squisherChirayu Desai2015-10-061-5/+6
| | | | | | | | | | | | Change-Id: I3cece868e56f85bfa0b31a62a51e6eab2070ab06
* | | build: Pass OTAPACKAGE location to squisherBrint E. Kriebel2015-10-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the OTAPACKAGE location so we don't have to guess what the package name will be. This fixes an issue when BUILD_NUMBER is defined in an environment with automated builds. Change-Id: Iab18b541de37c99d237aabc3cb7b2e9ab076617b
* | | Add recoveryzip target. Import recovery building/porting tools.Koushik Dutta2015-10-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | echo args Change-Id: Ib346a27d94ccab3e992fe3bc3be9e0010e7b89a0 mkvendor.sh: fixes for Android 4.2. Change-Id: Id7ff9ef03700d595734811ccf868371ffb024384 mkvendor: fix echoed build commands cm.mk.template uses PRODUCT_NAME := cm___DEVICE__ Change-Id: I063fc4b93d90ebb034637bf3e92d83c77aa439ca
* | | build-with-colors: moar colorsChirayu Desai2015-10-061-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - rename CL_PFX and CL_INS to better match the colors they show. - add more colors. Output of: - most host stuff is yellow - most target stuff is green - installing/copying files is cyan - import/export includes and notice files is cyan - bootimage/recoveryimage is cyan - and some more colors in many places ;) Change-Id: I5532afa4ba608e0a7c408516dc9f912f9ca389f7
* | | build in colors: Install outputs in blue/yellow [basic ics version]Tanguy Pruvot2015-10-061-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "target prefix:" in yellow "Install: file" in cyan should be in a single command line else there are sync problems in multithread (-j X) These colors can be tuned in core/Makefile if you use a white terminal. can be disabled with "export BUILD_WITH_COLORS=0" Only the most important output is colored to reduce ics merge problems Change-Id: I0e585079fde6900799ef209367a523d94a51cda5 Colors: add more colors to final build steps also fix releasetool echo and visible recovery echos Change-Id: Icf5d88468572f935610c544bf1d5d356ec9870d3 build in colors: host C/C++ Change-Id: Ic415cab53a2efa104c9d4b31ddbe8c8eb74e493d
* | | Add ro.cm.device to build.propRobert Burns2015-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | As requested by Ricardo Cerqueira: http://r.cyanogenmod.com/#change,11423,patchset=1 Change-Id: If08cc13c0f0e92e0dd262a2f71610070a54aaead
* | | build: Run squisher for the bacon targetSteve Kondik2015-10-061-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If33402a5eb1661345c7d37ec1778742096449c70 TARGET_CUSTOM_RELEASETOOL is a squisher replacement Change-Id: I9c7126d6bbe0303c1d35bb54ec2f0c9187b131e0 Fix tabs, sorry bad commit --amend :p Change-Id: Ia981edb520d7b5f91e0717f6b4d8180386c8a20d
* | | Allow override of device asserts, including multi-device support.Steve Kondik2015-10-061-0/+6
| | | | | | | | | | | | | | | | | | | | | Set in board file with TARGET_OTA_ASSERT_DEVICE. (cherry-picked from commit 0f452f21fc9323b9d1fe746161761cf40aaa5030) Change-Id: I3d06bdc0e3e26bde0c0e646accd050364f9713b9
* | | Add otapackage support for backuptoolChris Soyars2015-10-061-0/+7
| | | | | | | | | | | | Change-Id: I512554c579d444067cd3ccbb0e6946a5eb6bc964a
* | | add support for custom releasetoolscodeworkx2015-10-061-6/+18
| | | | | | | | | | | | Change-Id: Ifa026e63150a82fa5dc73d7cf13354098b3e55f2
* | | add support for overriding build.prop settings.Koushik Dutta2015-10-061-0/+1
| | | | | | | | | | | | Change-Id: Ie4224d608b7bcb0c2087bd77bc954f8f5f9b6495
* | | make bacon and custom releasetool (for squished zips)Tanguy Pruvot2015-10-061-1/+6
|/ / | | | | | | Change-Id: I4f61b6a6b9b8bab8582fa5423c4134c07af17606
* | Fix issie #23116383: Include security patch level in SettingsDianne Hackborn2015-08-121-0/+2
|/ | | | Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
* fix device specific fs_config on build serverThierry Strudel2015-07-101-14/+14
| | | | | | | | | | | | | | | | fs_config function from libcutils, in order to properly set the xattr FS used to define device specific uid, gid, permissions and capabilities, now needs TARGET_OUT make variable to be passed explicitly to all tools using it: fs_config fs_get_stats used by mktarball.sh make_ext4fs used by mkuserimg.sh mksquashfs used by mksquashfsimage.sh Bug: 21989305 Bug: 22048934 Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded Signed-off-by: Thierry Strudel <tstrudel@google.com>
* Retry adjusting the size computation for reserved blocks.Tao Bao2015-06-291-1/+13
| | | | | | | | | | | | | | | | | Due to the change in https://lwn.net/Articles/546473/, kernel reserves a few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to OTA update failures. Adjust the size computation if the device has BOARD_HAS_EXT4_RESERVED_BLOCKS := true. It amends the last attemp in [1]. Now it computes the used blocks from the make_ext4fs output, instead of altering its argument. [1]: commit efbb5d2e692283be32069e808b88522727c7fe98. Bug: 21522719 Bug: 22023465 Bug: 22174684 Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
* Revert "Adjust the size computation for reserved blocks"Tao Bao2015-06-291-14/+1
| | | | | | | | | We should not change the parameter to mkfs_ext4. Bug filed at b/22174684. Will come up with a new CL. This reverts commit efbb5d2e692283be32069e808b88522727c7fe98. Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
* resolved conflicts for merge of 1a4658cd to mnc-devMohamad Ayyash2015-06-251-1/+1
|\
| * resolved conflicts for merge of ef5dc90b to lmp-mr1-ub-devMohamad Ayyash2015-06-241-1/+19
| |\
| | * Add img2simg in host and ota packagesMohamad Ayyash2015-06-241-1/+2
| | | | | | | | | | | | | | | Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* | | Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-devSimon Wilson2015-06-241-0/+2
|\ \ \
| * \ \ resolved conflicts for merge of ecfc97f7 to mnc-devSimon Wilson2015-06-241-0/+2
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
| | * | resolved conflicts for merge of f86e7eea to lmp-mr1-ub-devSimon Wilson2015-06-241-0/+2
| | |\ \ | | | |/ | | | | | | | | Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
| | | * Add compressor options for squashfs system imagesSimon Wilson2015-06-221-0/+2
| | | | | | | | | | | | | | | | Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
* | | | Merge "Add img2simg in host and ota packages" into mnc-devMohamad Ayyash2015-06-241-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add img2simg in host and ota packagesMohamad Ayyash2015-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* | | | am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-devMohamad Ayyash2015-06-241-0/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'f35ed6bd8497633c057030e5442cd0fc29b37b6c': Allow flashing a squashfs system image
| * | | resolved conflicts for merge of cade49dd to lmp-mr1-ub-devMohamad Ayyash2015-06-231-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | Allow flashing a squashfs system imageMohamad Ayyash2015-06-161-0/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* | | | Adjust the size computation for reserved blocksTao Bao2015-06-231-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the change in https://lwn.net/Articles/546473/, kernel reserves a few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to OTA update failures. Adjust the size computation if the device has BOARD_HAS_EXT4_RESERVED_BLOCKS := true. Bug: 21522719 Bug: 22023465 Change-Id: I49f16adbf2dedc5279fbb8622bf99ef71dcc494f
* | | | Add missing shared libraries to dist toolsClaes Elgemark2015-06-091-1/+9
| |_|/ |/| | | | | | | | | | | | | | | | | | | | (cherry pick from d0ec6657273f97c8defa94a44bac31f3f77f57bd) Add missing libraries used by e2fsck and build_verity_tree. Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
* | | Initialize ro.build.version.preview_sdkAdam Powell2015-05-211-0/+1
| | | | | | | | | | | | | | | | | | | | | Set the initial (version 1!) value for the preview SDK version readable by apps. If we're on a release version, force it to be 0. Change-Id: Ib3e6cad1f59cea8e4a781827d4a35dd3620b90f1
* | | [versionitis] pull image id from recovery into propsAndres Morales2015-05-081-24/+29
| | | | | | | | | | | | | | | | | | - remove root/build.prop, merge with root/default.prop Change-Id: I913c67d948678745c0bb1b614ac10a0b7488e5c4
* | | am d6d6077c: am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, ↵Mark Salyzyn2015-04-151-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | libcutils and libselinux shared libraries" * commit 'd6d6077c999e4ef335312f2740d5d7ad20572f79': disttools: add liblog, libcutils and libselinux shared libraries
| * | am 2f1bc255: am 8b75ec1c: Merge "disttools: add liblog, libcutils and ↵Mark Salyzyn2015-04-151-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | libselinux shared libraries" * commit '2f1bc255fc7f0f5a8f6fd96296a119120bc04726': disttools: add liblog, libcutils and libselinux shared libraries
| | * | disttools: add liblog, libcutils and libselinux shared librariesMark Salyzyn2015-04-141-1/+4
| | | | | | | | | | | | | | | | | | | | Bug: 19908228 Change-Id: I48450a9fb917408cb3bc0e41d70c0593acd2b884
* | | | Merge "Separate boot and recovery image signing from dm-verity"Sami Tolvanen2015-04-101-3/+4
|\ \ \ \
| * | | | Separate boot and recovery image signing from dm-veritySami Tolvanen2015-04-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow dm-verity to be enabled without boot and recovery images being signed. This makes it possible to enable only dm-verity to detect corruption without confusing bootloaders that do not understand signed images. Bug: 19985143 Change-Id: Ie52c6ff595faa7a5c1f1bc1b37f6899c4d0c7001
* | | | | am 9e275b1d: am 083c1d7f: am 87df99f2: Merge "Fix the font size selection ↵Tao Bao2015-04-091-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | for recovery mode" * commit '9e275b1d8b1d729761dc2e873735ea0f14c29b11': Fix the font size selection for recovery mode
| * | | | am 083c1d7f: am 87df99f2: Merge "Fix the font size selection for recovery mode"Tao Bao2015-04-091-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '083c1d7f7d0fad8ee071622caf15f02a1fcdd4b3': Fix the font size selection for recovery mode
| | * | | Merge "Fix the font size selection for recovery mode"Tao Bao2015-04-081-1/+1
| | |\ \ \
| | | * | | Fix the font size selection for recovery modeTao Bao2015-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shamu has a 560dpi density, which is between xxhdpi and xxxhdpi. It deserves the large font (18x32), otherwise it falls back to use the small one and makes it mostly unreadable under recovery mode. Amend the list to include 560dpi and 400dpi that are higher than xhdpi. Ideally we should map string formats back to numbers for easy comparison (and to handle any high but odd density values). Change-Id: Ie08d9ce5e1c8850ff30a79bcbfd1b89e971b7e07
* | | | | | am 58a7e3ac: am b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing ↵Ying Wang2015-04-091-4/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use of ." * commit '58a7e3acacea8b458cac8d46edf084d7ddbf8ad3': Remove unnecessary confusing use of $(intermediate).
| * | | | | am b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing use of ."Ying Wang2015-04-091-4/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b78a6d7b2cc97431e666228eee5f82eec4e49be8': Remove unnecessary confusing use of $(intermediate).
| | * | | | Remove unnecessary confusing use of $(intermediate).Ying Wang2015-04-081-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e73c3c1bf94540419e1fd227a3096da148e2459