Commit graph

19930 commits

Author SHA1 Message Date
The Android Automerger
d578fc0b95 "LKY79" 2015-03-20 06:06:23 -07:00
The Android Automerger
055db7a11b merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-20 06:05:07 -07:00
The Android Automerger
539a396b36 "LKY78" 2015-03-19 06:06:46 -07:00
The Android Automerger
b2e4aa67a2 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-19 06:05:10 -07:00
Justin Morey
292427b69f am 030b5493: resolved conflicts for merge of 68000907 to lmp-mr1-dev
* commit '030b5493147d47a726e9f3e0e474772b29ad3111':
  Bump generic_x86_64 system partition size - DO NOT MERGE
2015-03-19 02:47:00 +00:00
Justin Morey
030b549314 resolved conflicts for merge of 68000907 to lmp-mr1-dev
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
2015-03-18 21:29:09 -05:00
Justin Morey
68000907e3 am 02060b7b: Bump generic_x86_64 system partition size - DO NOT MERGE
* commit '02060b7bddbb8728fa5a4ba5e0905e5a173bc682':
  Bump generic_x86_64 system partition size - DO NOT MERGE
2015-03-18 23:00:33 +00:00
Justin Morey
02060b7bdd Bump generic_x86_64 system partition size - DO NOT MERGE
This makes it big enough to hold Orla, unbreaking the build

Change-Id: I5a131dfbaaa3aa2bb1bc24e4f859cc3507b671b0
2015-03-18 21:04:14 +00:00
The Android Automerger
4568ab2e05 "LKY77" 2015-03-18 06:06:27 -07:00
The Android Automerger
2dca75ddb3 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-18 06:05:20 -07:00
The Android Automerger
dbf0141086 "LKY76" 2015-03-17 06:06:41 -07:00
The Android Automerger
8bc6dbdd84 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-17 06:05:08 -07:00
The Android Automerger
db175c8840 "LKY75" 2015-03-16 06:05:29 -07:00
The Android Automerger
28f56280e7 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-16 06:05:10 -07:00
The Android Automerger
56a3b76aeb "LKY73" 2015-03-14 06:06:04 -07:00
The Android Automerger
e6e579636e merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-14 06:05:13 -07:00
Ying Wang
4cbc4b392d am ae61f50a: Support to configure and build multiple custom images.
* commit 'ae61f50a680d4a8e91274b35305dc2e24959abbe':
  Support to configure and build multiple custom images.
2015-03-14 00:17:52 +00:00
Ying Wang
ae61f50a68 Support to configure and build multiple custom images.
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
   PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
   Each makefile configures an image.
   For image configuration makefile foo/bar/xyz.mk, the built image
   file name
   will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
  - CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
    etc.
  - CUSTOM_IMAGE_PARTITION_SIZE
  - CUSTOM_IMAGE_FILE_SYSTEM_TYPE
  - CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
    accepted by BuildImage() in tools/releasetools/build_image.py.
  - CUSTOM_IMAGE_MODULES, a list of module names you want to include
    in the image; Not only the module itself will be installed to proper
    path in the image, you can also piggyback additional files/directories
    with the module's LOCAL_PICKUP_FILES.
  - CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
    the image. <dest> is relativ to the root of the image.

To build all those images, run "make custom_images".

Bug: 19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit 5fcf1094f9)
2015-03-14 00:06:54 +00:00
The Android Automerger
d5b7ed68ba "LKY72" 2015-03-13 06:07:04 -07:00
The Android Automerger
5aebde3caf merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-13 06:06:04 -07:00
Tao Bao
ae524f60bc am daebaa6e: Restrict the verification in block-based incremental OTAs
* commit 'daebaa6ed3fbf4e7943e6c8290ec6b9233b542e9':
  Restrict the verification in block-based incremental OTAs
2015-03-12 22:56:28 +00:00
Tao Bao
daebaa6ed3 Restrict the verification in block-based incremental OTAs
BlockImageDiff has three versions. Only the incremental OTAs generated
with the latest version (3) can be re-applied to the system that's
already on the target build. Otherwise, operations like move will make
unconditional changes and damage the system. During the verification
phase, abort the OTA update if BlockImageDiff is less than 3 and it
doesn't match the checksum of the source build.

Change-Id: I3a776495b69e1d174fcb01b10e40c0e912914fd8
2015-03-12 13:47:04 -07:00
The Android Automerger
44500cf3c7 "LKY71" 2015-03-12 06:06:47 -07:00
The Android Automerger
9bae5788d2 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-12 06:05:20 -07:00
The Android Automerger
f2ad552790 "LKY70" 2015-03-11 06:05:53 -07:00
The Android Automerger
76ea80887e merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-11 06:05:11 -07:00
The Android Automerger
1ec82b70f5 "LKY69" 2015-03-10 06:06:38 -07:00
The Android Automerger
9eecf35fdd merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-10 06:05:10 -07:00
The Android Automerger
1dab37b678 "LKY68" 2015-03-09 06:05:23 -07:00
The Android Automerger
d516bb3a2b merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-09 06:05:08 -07:00
The Android Automerger
89829b47c4 "LKY66" 2015-03-07 06:05:32 -08:00
The Android Automerger
db75052fb8 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-07 06:05:07 -08:00
The Android Automerger
ed1dcf450a "LKY65" 2015-03-06 06:06:10 -08:00
The Android Automerger
6c08185dad merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-06 06:05:13 -08:00
The Android Automerger
9cc8d22be1 "LKY64" 2015-03-05 06:06:19 -08:00
The Android Automerger
6249df7238 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-05 06:05:10 -08:00
The Android Automerger
d28ceb16f5 "LKY63" 2015-03-04 06:05:48 -08:00
The Android Automerger
4cc50ceaff merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-04 06:05:08 -08:00
The Android Automerger
312a1eeafb "LKY62" 2015-03-03 06:07:33 -08:00
The Android Automerger
db07390c4b merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-03 06:05:09 -08:00
The Android Automerger
3b22a9c51c LKY61B 2015-03-02 16:40:06 -08:00
The Android Automerger
8b9adcb147 "LKY61" 2015-03-02 06:05:26 -08:00
The Android Automerger
9616fe2764 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-02 06:05:11 -08:00
The Android Automerger
1a306ca1e8 "LKY59" 2015-02-28 06:06:24 -08:00
The Android Automerger
5d8cde9b2b merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-28 06:05:15 -08:00
Ryosuke Matsuuchi
3e7688d041 am 3c242c5d: am 4b2537f3: am e34b4ec4: am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '3c242c5ddb8b867b916875c8e05c260a9d8571b6':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:51:04 +00:00
Ryosuke Matsuuchi
3c242c5ddb am 4b2537f3: am e34b4ec4: am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '4b2537f39d7ac29258908e1a38ebdf085fd44c5f':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:42:54 +00:00
Ryosuke Matsuuchi
4b2537f39d am e34b4ec4: am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit 'e34b4ec484faf5dac8286bb17bedeed0e83a6962':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:38:38 +00:00
Ryosuke Matsuuchi
e34b4ec484 am 2b486dc8: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '2b486dc8c3af8cb82f49933356d1d49ad48da619':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:33:43 +00:00
The Android Automerger
ab5ee54034 "LKY58" 2015-02-27 06:06:11 -08:00