summaryrefslogtreecommitdiffstats
path: root/core/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
* | | am 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-masterYing Wang2015-04-091-23/+25
|\ \ \ | |/ / | | | | | | | | | * commit '4acabe0fd8778aad079ed4b3a9bbe011db12ece3': Better way to package up the otatools-package.
| * | Better way to package up the otatools-package.Ying Wang2015-04-081-27/+26
| |/ | | | | | | | | | | | | | | With this, you can easily add more executables, jars or shared libraries to the package. Also now it automatically takes care of 32-bit-v.s.-64-bit library issue. Change-Id: I5afe00fadc978d0da229b192eca1a4b1c149764e
* | am 6fe4ab94: am 58912c87: Merge "Don\'t fail build of otatools if there are ↵Ying Wang2015-04-031-1/+1
|\ \ | | | | | | | | | | | | | | | | | | no device certificates" * commit '6fe4ab94878c7fd96ca41ac93c0684ba86e10a45': Don't fail build of otatools if there are no device certificates
| * \ am 58912c87: Merge "Don\'t fail build of otatools if there are no device ↵Ying Wang2015-04-031-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | certificates" * commit '58912c874bff05e3e76ccc7b7907f628ed010bf5': Don't fail build of otatools if there are no device certificates
| | * Merge "Don't fail build of otatools if there are no device certificates"Ying Wang2015-04-031-1/+1
| | |\
| | | * Don't fail build of otatools if there are no device certificatesClaes Elgemark2015-04-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
* | | | am da885b90: am 71d4c95f: Merge "Fix typo."Ying Wang2015-04-021-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'da885b90e4c47a0e29597da185ec95a7e4e3a73c': Fix typo.
| * | | am 71d4c95f: Merge "Fix typo."Ying Wang2015-04-021-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '71d4c95f83018199b8e79d0800dd2eca80b9f728': Fix typo.
| | * | Fix typo.Ying Wang2015-04-021-1/+1
| | |/ | | | | | | | | | Change-Id: Ic934ed8610a4f03fbfb3d06dff4d911734a9d818
* | | am ae26f5b0: am 53602955: Merge "Add support to sign bootable images with ↵Tao Bao2015-04-011-1/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | vboot_signer" * commit 'ae26f5b002de956d495c4019b365040490ff18dd': Add support to sign bootable images with vboot_signer
| * | am 53602955: Merge "Add support to sign bootable images with vboot_signer"Tao Bao2015-04-011-1/+9
| |\ \ | | |/ | | | | | | | | | * commit '536029551d31d8084c444063349291781ee43ae1': Add support to sign bootable images with vboot_signer
| | * Add support to sign bootable images with vboot_signerTao Bao2015-04-011-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add vboot properties to the dictionary file, which will be packed into the target_files zip. Add support in packaging and OTA scripts to sign the generated bootable images (boot.img and recovery.img) when vboot is enabled. Change-Id: I08758ced03d173219415bca762bbdb66c464a9f5 (cherry picked from commit 5d5a3bd9e8d8b14b71d1b2105417a2958d13d3d2)
* | | am 55adb5a3: am 1b23b33d: Merge "MKBOOTIMG override were missing in two places"Ying Wang2015-03-271-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '55adb5a380f801038c00b2e169d33b6da93dfacc': MKBOOTIMG override were missing in two places
| * | am 1b23b33d: Merge "MKBOOTIMG override were missing in two places"Ying Wang2015-03-271-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '1b23b33d92f32626584153739308e9147d1541bd': MKBOOTIMG override were missing in two places
| | * Merge "MKBOOTIMG override were missing in two places"Ying Wang2015-03-271-2/+2
| | |\
| | | * MKBOOTIMG override were missing in two placesPer Astrand2015-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change follows the patten found in "Package OTA" and other places to allow for overriding the mkbootimg command. Now pass MKBOOTIMG variable to get make_recovery_patch and add_image_to_target to use the tool set in BOARD_CUSTOM_MKBOOTIMG for boot/recovery image generation. Change-Id: I78533c25e87c2750eb24ac1bf39e4b7ca321a441
* | | | am abc748c1: am 6ff1b035: Merge "Support to build image of root file system ↵Ying Wang2015-03-261-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | with /system and ramdisk combined." * commit 'abc748c11cbba71a99f306d318c74b5336b28730': Support to build image of root file system with /system and ramdisk combined.
| * | | am 6ff1b035: Merge "Support to build image of root file system with /system ↵Ying Wang2015-03-261-1/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | and ramdisk combined." * commit '6ff1b0357289c1ef1a7aa9294aae748dacb69866': Support to build image of root file system with /system and ramdisk combined.
| | * | Support to build image of root file system with /system and ramdisk combined.Ying Wang2015-03-261-1/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support to build system.img that combines contents of /system and the ramdisk, and can be mounted at the root of the file system. To enable this feature, define BoardConfig.mk variable: BOARD_BUILD_SYSTEM_ROOT_IMAGE := true Ideally we would just change TARGET_OUT (the path of the staging system directory) to under TARGET_ROOT_OUT. But at this point many places in the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and we can't make it easily configurable. Instead this implementation takes the least intrusive approach: We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a temporary staging directory that contains contents of both TARGET_OUT and TARGET_ROOT_OUT, in build_image.BuildImage() of tools/releasetools/build_image.py. When build_image.py is directly called from the makefile, we pass in the parameters from the global dictionary; when build_image.BuildImage() is called from add_img_to_target_files.py, we need to override values to point to files extracted from the target_files zip file. We need to combine the fs_config files of both /system and ramdisk, when fs_config is enabled. Also this change refactored build_image.BuildImage() by moving the extra parameters to the image property dictionary. (cherry-picked from commit 0eabd4f2c5fe704d3c3212b45b80775a35b55b1b) Bug:19868522 Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
* | | am fd496a64: am c70805ee: Merge "Set up environmental variable PATH before ↵Dan Albert2015-03-131-4/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | calling releasetools scripts." * commit 'fd496a64277e331487048acee586da6ad5d02870': Set up environmental variable PATH before calling releasetools scripts.
| * | am c70805ee: Merge "Set up environmental variable PATH before calling ↵Dan Albert2015-03-131-4/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | releasetools scripts." * commit 'c70805eef5be3e10003518d24adb083dcd1efbc2': Set up environmental variable PATH before calling releasetools scripts.
| | * Set up environmental variable PATH before calling releasetools scripts.Ying Wang2015-03-131-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some releasetools python sripts rely on $PATH to search for the executables. With this change, you don't need to run lunch even after you change the build system variable OUT_DIR. Bug: 19320328 Change-Id: Ia44b11084fb1bdcceb60b1d33cb7e460c9b705a8 (cherry picked from commit 9d252e10096d4f730f39662e81489e4a13752d29)
* | | am 7c4a3464: am fcd0d98b: Merge "include oem.prop files in otatools_package"Dan Albert2015-03-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '7c4a34642aecebb35845345cc86dfe63c86936f5': include oem.prop files in otatools_package
| * | am fcd0d98b: Merge "include oem.prop files in otatools_package"Dan Albert2015-03-131-1/+1
| |\ \ | | |/ | | | | | | | | | * commit 'fcd0d98b6cedde450a6e4d62df2209d8295752fc': include oem.prop files in otatools_package
| | * include oem.prop files in otatools_packageDoug Zongker2015-03-131-1/+1
| | | | | | | | | | | | | | | Change-Id: I2f28936edda5d8d9bff6213828c16d607263cd95 (cherry picked from commit ce43bc8df2fae960eb02e56a55d365e7c18a1fc1)
| | * DO NOT MERGE: Bundle libc++.so into otatools-package.Jesse Zhao2015-03-131-3/+6
| |/ | | | | | | | | Change-Id: I6b7d16eca18dce3e2990464f3d1a34740ad8a8ee (cherry picked from commit f7daa92cff1de4a03616b0851f303830bee0de0b)
* | am 4cdf1357: Merge "add otatools-package target"Dan Albert2015-03-131-0/+24
|\ \ | |/ | | | | | | * commit '4cdf1357433b407b350517779248e2194c88c3f4': add otatools-package target
| * add otatools-package targetDoug Zongker2015-03-131-0/+24
| | | | | | | | | | | | | | | | Add a target to zip up all the otatools and releasetools, for easy copying to the OTA builder machine. Change-Id: If14b4afefcc1a20ea19dfca3f3b9f9fae73189a6 (cherry picked from commit f22b0f43efbc16c548692dc239a387edda15d78f)
| * Merge "Change transfer list format to include block hashes"Sami Tolvanen2015-03-131-1/+1
| |\ |/ /
| * Change transfer list format to include block hashesSami Tolvanen2015-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add source and target block hashes as parameters to transfer list commands that copy or patch data to a partition. This allows the updater to verify the status of each command in the transfer list and makes resuming block based OTAs possible. Due to the changes, update the transfer list version to 3. Needs matching changes from I1e752464134aeb2d396946348e6041acabe13942 Bug: 18262110 Change-Id: Ia5c56379f570047f10f0aa7373a1025439495c98 (cherry picked from commit cac671a9d175039ecbfe3cd84fe10b183aab1f8a)
* | Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)Ying Wang2015-03-111-2/+2
| | | | | | | | | | | | | | | | | | "cp -Rf" fails on Mac OS when some broken symlinks exist in the dest dir. Also switch to better shell error handling when copying init.recovery.*.rc. Change-Id: Idd05f7604736b234619f62be12dd108fac91fed1
* | Support modules to be installed directly to recovery.imgYing Wang2015-03-111-4/+4
|/ | | | | | | | | | | | Previously the recovery binary was configured to be installed to the system.img and then got copied to recovery.img in the recovery.img's build rule. With this change, a module, such as the recovery binary, can configure itself to be installed directly to the recovery.img, just like how other modules get installed to system.img. Bug: 19667686 Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
* resolved conflicts for merge of fc759204 to stage-aosp-masterMohamad Ayyash2015-03-041-0/+6
|\ | | | | | | Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
| * Allow flashing a squashfs system imageMohamad Ayyash2015-03-031-0/+6
| | | | | | | | | | Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* | am 4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"Ying Wang2015-02-261-4/+4
|\ \ | |/ | | | | | | * commit '4eec22a6627927aaa11a67e3e18d36534af81856': Use a less freqent dummy file name: zipdummy
| * Use a less freqent dummy file name: zipdummyYing Wang2015-02-261-4/+4
| | | | | | | | | | | | | | | | | | Previously if user has a directory with name dummy in the root of the source tree, "zip -qd package.apk dummy" fails with: "zip error: Nothing to do!". This change mitigates the error. Change-Id: I642e3bf0378e5b9911a068ecb72f795b3e92f1fe
* | resolved conflicts for merge of 7fc55db3 to lmp-mr1-dev-plus-aospJP Abgrall2015-02-111-17/+1
|\ \ | |/ | | | | Change-Id: I27b9c65d654d4cc8b806043de0ebaa5dbf7b7a7c
| * core: remove dependencies on genext2fsJP Abgrall2015-02-111-12/+1
| | | | | | | | | | | | | | | | We don't use EXT2 for bootimage anymore. This will allow getting rid of external/genext2fs Bug: 19282953 Change-Id: Ie56528c7877036d2501a09888a4420637f9cd647
* | am b5df7d48: Merge "Add version strings from android-info.txt into build.prop"Andres Morales2015-02-101-1/+2
|\ \ | |/ | | | | | | * commit 'b5df7d483772d1dd08a1d5c8614f38a79e43ec12': Add version strings from android-info.txt into build.prop
| * Merge "Add version strings from android-info.txt into build.prop"Andres Morales2015-02-091-1/+2
| |\
| | * Add version strings from android-info.txt into build.propAndres Morales2015-02-091-1/+2
| | | | | | | | | | | | | | | | | | Allows runtime checking of expected baseband/bootloader. Change-Id: Iccb053fee5f72f4e082a5c3482c0710b13ee7eb8
* | | am b998054f: Merge "Add system/build.prop dependency on vendor/bootimg"Andres Morales2015-02-061-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'b998054f50043c23e8599ee3cfae058ac378c5cb': Add system/build.prop dependency on vendor/bootimg
| * | Merge "Add system/build.prop dependency on vendor/bootimg"Andres Morales2015-02-061-1/+1
| |\ \ | | |/
| | * Add system/build.prop dependency on vendor/bootimgAndres Morales2015-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When incremental builds only affect the system partition, the build.prop file for other partitions might go out of date. Add a dependency on system/build.prop s.t. when it's rebuilt, the fingerprints are updated on the other partition's build.prop's. Bug:19058575 Change-Id: Iea7b761e0800c402eb4ce1154e8f6af5a17f7b06
* | | am 9edd7649: Merge "Remove mkyaffs2image references."Elliott Hughes2015-02-051-11/+2
|\ \ \ | |/ / | | | | | | | | | * commit '9edd76494d4378bd740dd22a2eb4f5d0eb0db40f': Remove mkyaffs2image references.
generated by cgit v1.1 at 2025-02-11 06:25:33 +0000