Commit Graph

2728 Commits

Author SHA1 Message Date
Baligh Uddin
1131d89b42 Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
Bug: 17393134
Change-Id: Ic2325d7c1e1e7292c9339e169efbed526f82263c
(cherry picked from commit 339ee4968a)
2014-09-06 02:17:56 +00:00
Baligh Uddin
e0962d5a25 am bdc2e318: Add java_args as a valid option
* commit 'bdc2e3186fc4ab22b9249d8e1b317a024e295c7f':
  Add java_args as a valid option
2014-09-06 01:09:38 +00:00
Baligh Uddin
bdc2e3186f Add java_args as a valid option
Bug: 17393134
Change-Id: If2749d03b5d409a08d415a829dd21f986cac1789
2014-09-06 00:37:54 +00:00
Jeff Arneson
3a5cb1bd15 Show annotation information in generated documentation
Display the annotations used to override @hide for classes in packages
and methods in classes.

Bug: 16848303
Change-Id: I5599e6593613edbbe6a002d5d46a0a6561dec55a
2014-09-05 22:28:59 +00:00
Baligh Uddin
36ebce8f44 am 6b044131: Merge "Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools" into lmp-dev
* commit '6b0441319a219fbc5296a81e9f653bd808cb095d':
  Add jvm args option.  I rather not hardcode some large value just for Volantis.  This can easily be passed in from sign-build.sh and should be a no-op for any other tools
2014-09-05 22:15:45 +00:00
Baligh Uddin
339ee4968a Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
Bug: 17393134
Change-Id: Ic2325d7c1e1e7292c9339e169efbed526f82263c
2014-09-05 18:29:47 +00:00
Doug Zongker
5b09b00b11 am 424296a4: add missing AOSP copyright notices
* commit '424296a4e811f57ada27be68d60aeb5fcb1bb45b':
  add missing AOSP copyright notices
2014-09-02 16:18:55 +00:00
Doug Zongker
424296a4e8 add missing AOSP copyright notices
Change-Id: Idc812db30b259a55702f8728197f957f2d24d978
2014-09-02 08:53:09 -07:00
Ricardo Cervera
688d83d42a am 2178358f: am 71346e66: am 14d6c100: am 54d2ca33: docs: Changing adt bundle links to HTTPS
* commit '2178358f2f7dc7fc1748a2c3d3e39fade2bc40e0':
  docs: Changing adt bundle links to HTTPS
2014-08-27 16:53:15 +00:00
Ricardo Cervera
2178358f2f am 71346e66: am 14d6c100: am 54d2ca33: docs: Changing adt bundle links to HTTPS
* commit '71346e665f83bc80df5f32127639582387b100fd':
  docs: Changing adt bundle links to HTTPS
2014-08-27 16:28:11 +00:00
Ricardo Cervera
71346e665f am 14d6c100: am 54d2ca33: docs: Changing adt bundle links to HTTPS
* commit '14d6c100aa1926ec9e24c1f17e3aabba95141503':
  docs: Changing adt bundle links to HTTPS
2014-08-27 16:16:15 +00:00
Ricardo Cervera
54d2ca33a3 docs: Changing adt bundle links to HTTPS
Change-Id: I35c291bfef9a267aab5b8f108a6c6592c4f08750
2014-08-27 08:48:49 -07:00
Doug Zongker
caec135f4a am ab7ca1d2: refactor BlockDifference into common
* commit 'ab7ca1d2861e70d8ef8673d350b634111414039e':
  refactor BlockDifference into common
2014-08-26 21:16:46 +00:00
Doug Zongker
6bf43ebd8d am 4d0bfb4f: remove unused xdelta3/xz utilities
* commit '4d0bfb4f40496c607229b6c2bba723e7e315642e':
  remove unused xdelta3/xz utilities
2014-08-26 21:16:45 +00:00
Doug Zongker
670e15e4ab am 5f9c28ca: fix build
* commit '5f9c28cad4cc0b499837e91a8eea344c26264e32':
  fix build
2014-08-26 21:16:44 +00:00
Doug Zongker
d391040444 am fc44a515: new block OTA system tools
* commit 'fc44a515d46e6f4d5eaa0d32659b1cf3b9492305':
  new block OTA system tools
2014-08-26 21:16:43 +00:00
Doug Zongker
ab7ca1d286 refactor BlockDifference into common
Move BlockDifference into common and make its script generation code
more complete, so that it can be use by releasetools.py to do diffs on
baseband images.

Bug: 16984795
Change-Id: Iba9afc1c7755458ce47468b5170672612b2cb4b3
2014-08-26 13:12:11 -07:00
Doug Zongker
4d0bfb4f40 remove unused xdelta3/xz utilities
This was part of the original block-based OTA mechanism.

Bug: 16987495
Change-Id: I5bd6599829ee6084a8da1f0b14af87aabf07c130
2014-08-26 13:11:56 -07:00
Doug Zongker
5f9c28cad4 fix build
Change-Id: I1e503406129343bbfddacc1150c81e403b47778c
2014-08-26 13:11:37 -07:00
Doug Zongker
fc44a515d4 new block OTA system tools
Replace the xdelta/xz-based block OTA generation with a new system
based on the existing bsdiff/imgdiff tools.

Bug: 16984795
Change-Id: Ia9732516ffdfc12be86260b2cc4b1dd2d210e886
2014-08-26 13:10:25 -07:00
Doug Zongker
fd1754a687 am 6f1d031b: take bootable images from target_files if present
* commit '6f1d031b39ca2c666edab5ce966d1329f85dee1e':
  take bootable images from target_files if present
2014-08-22 17:54:14 +00:00
Doug Zongker
6f1d031b39 take bootable images from target_files if present
Now that we're building and saving images in the target_files at build
time, we should use those images instead of rebuilding them.

Bug: 17201052
Change-Id: I459e650f66f1e0bdf01ad54df9e34f36bf2ee899
2014-08-22 10:25:57 -07:00
Geremy Condra
9a7bf7ede4 am 95ebe7a0: Use the specified verity key to sign boot and recovery OTA images.
* commit '95ebe7a09b61931fc9e84b3ce43439c1eda40308':
  Use the specified verity key to sign boot and recovery OTA images.
2014-08-21 02:48:14 +00:00
Geremy Condra
95ebe7a09b Use the specified verity key to sign boot and recovery OTA images.
This ensures that when the verity key is rotated to a release key
both the boot and recovery images will be correctly signed. It does
mean that they will both be signed with the same key for now, but
as that doesn't change the threat model separating them is just a
distant nice-to-have.

Bug: 15725238
Change-Id: I5b75e4346fe0655065643ab553431690cc1a8cb0
2014-08-20 20:17:01 +00:00
Geremy Condra
5b108e4632 am f19b365c: Add support for switching to verity release keys.
* commit 'f19b365cc9021104586d65385d246db06639fc46':
  Add support for switching to verity release keys.
2014-08-20 00:21:18 +00:00
Geremy Condra
f19b365cc9 Add support for switching to verity release keys.
Bug: 15725238
Change-Id: I8f92210fd854b5a2567cf76aaecb5be02c3f9293
2014-08-20 00:05:23 +00:00
Doug Zongker
10357eb5a2 am ad876835: Merge "save file block allocations in target_files" into lmp-dev
* commit 'ad876835c4343a7c499d09bd90b9e79634b972e4':
  save file block allocations in target_files
2014-08-13 00:27:59 +00:00
Doug Zongker
f21cb5a219 save file block allocations in target_files
make_ext4fs can now output a file listing the blocks used for each
file in the image.  Request this file and save it in the target_files;
it will be used for future improvements to block OTAs.

Bug: 16984795
Change-Id: Id1e60465e3b5a9d126a7934b4d089cf34d8fec44
2014-08-12 17:09:38 -07:00
Benoit Fradin
a45a8682fa BuildBootImage: Add secondstage image support [DO NOT MERGE]
The AOSP bootimage format allows the use of a second stage image
however the BuildBootableImage function does not allows the "second"
optional argument. This patch adds the support of this argument.

Bug: 17035158

Change-Id: I8ed9d9e56449945c2d42fc908269921c394f68c0
Signed-off-by: Benoit Fradin <benoit.fradin@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Signed-off-by: Patrick Tjin <pattjin@google.com>
2014-08-14 11:24:54 -07:00
Kenny Root
c2ed5ace0b am fdeb0ea6: am 68715d01: Merge "Add SignTos tool"
* commit 'fdeb0ea673bd38b81c47504936030c62dd24a82d':
  Add SignTos tool
2014-08-08 22:42:30 +00:00
Kenny Root
9221ce6705 Add SignTos tool
Change-Id: Iac7db75cda383e333a55236c3678cd56f8245d6e
2014-08-08 13:18:53 -07:00
Ying Wang
5a5d443f15 am 8ac188ff: am 6dbbb159: Merge "Consistent use of USE_MINGW"
* commit '8ac188ff0e739ea75ea02166c54428245200f088':
  Consistent use of USE_MINGW
2014-08-08 03:26:07 +00:00
Kenny Root
cb73049485 am b12830aa: am fe12e8f0: Merge "Track bouncycastle upgrade to 1.51"
* commit 'b12830aa796496cbbaf058ccaa0c5c576722cb9f':
  Track bouncycastle upgrade to 1.51
2014-08-07 20:01:41 +00:00
Kenny Root
bda807d3a1 Track bouncycastle upgrade to 1.51
The new API in 1.51 will allow null return values.

Change-Id: I583690bf0740b2d0962f02edea3896e18626e548
2014-08-07 12:11:47 -07:00
Ying Wang
594a10ae77 Consistent use of USE_MINGW
Change-Id: I05e212e5a99639d0196006b9c2ec35072c54f399
2014-08-07 20:08:04 -07:00
Brian Carlstrom
56ef86df84 resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp
(cherry picked from commit 4a5a11e416)

Change-Id: Ic5c2297d50f2e59ca5b1eb0c3b81328d23a48253
2014-08-06 17:47:40 -07:00
Colin Cross
372e0ed436 am 8381b988: Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev
* commit '8381b988698bf891add85608648dfe1cc0c599bc':
  Revert "HACK: report CPU abi as 2nd arch if present"
2014-08-05 22:40:01 +00:00
Doug Zongker
55cbe8b157 am f8340089: add 5 minute timeout on binary patch construction
* commit 'f83400896de5e8bc2b21a0dce98382d9ed0ab537':
  add 5 minute timeout on binary patch construction
2014-08-05 17:55:48 +00:00
Colin Cross
8381b98869 Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev 2014-08-05 17:41:31 +00:00
Colin Cross
ef77e517f7 Revert "HACK: report CPU abi as 2nd arch if present"
This reverts commits 8179d4dcf6,
00c67a0568, and
d00c0a2e20.

Bug: 15933961
2014-08-05 11:01:54 -07:00
Doug Zongker
f83400896d add 5 minute timeout on binary patch construction
When making bsdiff/imgdiff patches, give up after 5 minutes.  (On
certain large files it can take hours to build a patch, if it ever
even completes.)

Change-Id: I123c06f8194f85f6f4e640f7eb31c7746f76ba4d
2014-08-05 10:39:37 -07:00
Doug Zongker
9d03c1fdc4 am 56d91dd0: Merge "fall back to generating full OTA if incremental fails" into lmp-dev
* commit '56d91dd07f96039344d6976da5d985d2508c9365':
  fall back to generating full OTA if incremental fails
2014-08-04 23:17:43 +00:00
Doug Zongker
56d91dd07f Merge "fall back to generating full OTA if incremental fails" into lmp-dev 2014-08-01 17:53:35 +00:00
Doug Zongker
62d4f18a30 fall back to generating full OTA if incremental fails
Block incremental OTA generation can currently fail on some
target-files pairs.  Fall back to generating a full OTA so that the
script succeeds rather than failing.

Change-Id: Ide70395d1f3759aa2076bd173836f6a5e5b397c0
2014-08-04 16:06:43 -07:00
Doug Zongker
4c15eda124 am 285dd138: Merge "store images in target-files" into lmp-dev
* commit '285dd13885f3960a8b6d0225dcd72edef2d1a5ab':
  store images in target-files
2014-08-01 13:50:32 +00:00
Doug Zongker
3c84f56948 store images in target-files
Store sparse images in the target-files, and use those (when they're
available) for building block OTAs.

- New script add_img_to_target_files is added to make the images and
  add them to the IMAGES/ subdir in the target-files.  It gets run
  from the Makefile when building a target-files.

- img_from_target_files becomes mostly vestigial: it creates the
  img.zip by just copying the images out of the target-files.  (It
  still knows how to build images for use on older target-files.)

- ota_from_target_files uses images from the target-files in
  preference to rebuilding images from the source files.

- sign_apk_target_files builds images and includes them in its output
  target files (even if the input target-files didn't have them).

Bug: 16488065
Change-Id: I444e0d722d636978209467ffc01750a585c6db75
2014-07-31 11:06:30 -07:00
Ying Wang
51e4698dc6 am 4365dcec: am 38868b9b: Merge "BuildBootImage: Add secondstage image support"
* commit '4365dcece2ee9a4e91c3556d4f9a88c1cbe98dbd':
  BuildBootImage: Add secondstage image support
2014-07-31 17:31:08 +00:00
Benoit Fradin
fb9076d9f2 BuildBootImage: Add secondstage image support
The AOSP bootimage format allows the use of a second stage image
however the BuildBootableImage function does not allows the "second"
optional argument. This patch adds the support of this argument.

Change-Id: I8ed9d9e56449945c2d42fc908269921c394f68c0
Signed-off-by: Benoit Fradin <benoit.fradin@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2014-07-31 11:20:57 +00:00
Brian Carlstrom
4a5a11e416 resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp
Change-Id: I5573d097d741f4922b791b33de5c941af08127c6
2014-07-30 09:53:12 -07:00
Brian Carlstrom
dad2ab4df4 Add PROP_NAME_MAX validation
Change-Id: I49179c83ae163de6f6fb398c5de60c5d296ca009
2014-07-29 16:13:18 -07:00