summaryrefslogtreecommitdiffstats
path: root/core/Makefile
Commit message (Expand)AuthorAgeFilesLines
* am 083c1d7f: am 87df99f2: Merge "Fix the font size selection for recovery mode"Tao Bao2015-04-091-1/+1
|\
| * 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
* | | am b78a6d7b: am 2594d3d1: Merge "Remove unnecessary confusing use of ."Ying Wang2015-04-091-4/+1
|\ \ \ | |/ /
| * | Remove unnecessary confusing use of $(intermediate).Ying Wang2015-04-081-4/+1
* | | am 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-masterYing Wang2015-04-091-23/+25
|\ \ \ | |/ /
| * | Better way to package up the otatools-package.Ying Wang2015-04-081-27/+26
| |/
* | am 6fe4ab94: am 58912c87: Merge "Don\'t fail build of otatools if there are n...Ying Wang2015-04-031-1/+1
|\ \
| * \ am 58912c87: Merge "Don\'t fail build of otatools if there are no device cert...Ying Wang2015-04-031-1/+1
| |\ \ | | |/
| | * 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
* | | | am da885b90: am 71d4c95f: Merge "Fix typo."Ying Wang2015-04-021-1/+1
|\ \ \ \ | |/ / /
| * | | am 71d4c95f: Merge "Fix typo."Ying Wang2015-04-021-1/+1
| |\ \ \ | | |/ /
| | * | Fix typo.Ying Wang2015-04-021-1/+1
| | |/
* | | am ae26f5b0: am 53602955: Merge "Add support to sign bootable images with vbo...Tao Bao2015-04-011-1/+9
|\ \ \ | |/ /
| * | am 53602955: Merge "Add support to sign bootable images with vboot_signer"Tao Bao2015-04-011-1/+9
| |\ \ | | |/
| | * Add support to sign bootable images with vboot_signerTao Bao2015-04-011-1/+9
* | | am 55adb5a3: am 1b23b33d: Merge "MKBOOTIMG override were missing in two places"Ying Wang2015-03-271-2/+2
|\ \ \ | |/ /
| * | am 1b23b33d: Merge "MKBOOTIMG override were missing in two places"Ying Wang2015-03-271-2/+2
| |\ \ | | |/
| | * 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
* | | | am abc748c1: am 6ff1b035: Merge "Support to build image of root file system w...Ying Wang2015-03-261-1/+4
|\ \ \ \ | |/ / /
| * | | am 6ff1b035: Merge "Support to build image of root file system with /system a...Ying Wang2015-03-261-1/+4
| |\ \ \ | | |/ /
| | * | Support to build image of root file system with /system and ramdisk combined.Ying Wang2015-03-261-1/+4
| | |/
* | | am fd496a64: am c70805ee: Merge "Set up environmental variable PATH before ca...Dan Albert2015-03-131-4/+6
|\ \ \ | |/ /
| * | am c70805ee: Merge "Set up environmental variable PATH before calling release...Dan Albert2015-03-131-4/+6
| |\ \ | | |/
| | * Set up environmental variable PATH before calling releasetools scripts.Ying Wang2015-03-131-4/+6
* | | am 7c4a3464: am fcd0d98b: Merge "include oem.prop files in otatools_package"Dan Albert2015-03-131-1/+1
|\ \ \ | |/ /
| * | am fcd0d98b: Merge "include oem.prop files in otatools_package"Dan Albert2015-03-131-1/+1
| |\ \ | | |/
| | * include oem.prop files in otatools_packageDoug Zongker2015-03-131-1/+1
| | * DO NOT MERGE: Bundle libc++.so into otatools-package.Jesse Zhao2015-03-131-3/+6
| |/
* | am 4cdf1357: Merge "add otatools-package target"Dan Albert2015-03-131-0/+24
|\ \ | |/
| * add otatools-package targetDoug Zongker2015-03-131-0/+24
| * 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
* | Use "rsync -a" to copy over $(TARGET_ROOT_OUT) to $(TARGET_RECOVERY_OUT)Ying Wang2015-03-111-2/+2
* | Support modules to be installed directly to recovery.imgYing Wang2015-03-111-4/+4
|/
* resolved conflicts for merge of fc759204 to stage-aosp-masterMohamad Ayyash2015-03-041-0/+6
|\
| * Allow flashing a squashfs system imageMohamad Ayyash2015-03-031-0/+6
* | am 4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"Ying Wang2015-02-261-4/+4
|\ \ | |/
| * Use a less freqent dummy file name: zipdummyYing Wang2015-02-261-4/+4
* | resolved conflicts for merge of 7fc55db3 to lmp-mr1-dev-plus-aospJP Abgrall2015-02-111-17/+1
|\ \ | |/
| * core: remove dependencies on genext2fsJP Abgrall2015-02-111-12/+1
* | am b5df7d48: Merge "Add version strings from android-info.txt into build.prop"Andres Morales2015-02-101-1/+2
|\ \ | |/
| * 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
* | | am b998054f: Merge "Add system/build.prop dependency on vendor/bootimg"Andres Morales2015-02-061-1/+1
|\ \ \ | |/ /
| * | 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
* | | am 9edd7649: Merge "Remove mkyaffs2image references."Elliott Hughes2015-02-051-11/+2
|\ \ \ | |/ /