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
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
Ying Wang
a961a09e59
Fix error: 'NoneType' object is not iterable
...
Change-Id: I5a54edbed0e5e5481a570b93c07d50f6ca3e18e0
2014-07-29 11:42:37 -07:00
David Friedman
ba6dc7272c
am 93848788: am 81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
...
* commit '9384878820ec7c881fdf054e8a0a88b2d1b94f64':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
2014-07-16 13:36:20 +00:00
David Friedman
9384878820
am 81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
...
* commit '81415adad38fe06f50f381d6317ca0b93848e095':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
2014-07-16 13:29:09 +00:00
Deepanshu Gupta
9c5564e060
Fix incremental builds for SDK.
...
Atree used to output files without escaping the filenames. This resulted
in breaks for incremental builds when filenames contained '$' symbol.
The change fixes this by escaping the filename properly.
Change-Id: I957787b1b3536c64ba6fcb5b4bb5fc60e8b04452
2014-07-15 17:26:56 -07:00
David Friedman
81415adad3
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
...
Change-Id: I33af76d23035067ed740d2bf734708aca8dcffe2
2014-07-15 11:38:40 -07:00
Daniel Rosenberg
f3bcb2d4c3
Merge "Added support for building verified vendor partition" into lmp-dev
2014-07-14 18:38:02 +00:00
Daniel Rosenberg
f4eabc3961
Added support for building verified vendor partition
...
Change-Id: I762724800ccab3a365e6d2efdf86cd9c394818eb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-14 22:55:22 +00:00
Colin Cross
8179d4dcf6
HACK: use CPU_ABI hack only for arm64
...
The previous hack breaks x86_64, use it only for arm64.
Bug: 15018047
Bug: 16116257
Change-Id: Ia11f237590f7f3c7bc6a25208415b86240d2d6be
2014-07-14 12:51:52 -07:00
Raph Levien
fed4c5ca5a
Merge "Add Zopfli-recompress option to zipalign"
2014-07-10 20:54:59 +00:00
Elliott Hughes
45a45d611f
am a97f675c: am 1b1840cb: am af95db03: Merge "ADBS now uses stack_core code to parse traces."
...
* commit 'a97f675c921efdbc34f33f12c9a523fc898e624f':
ADBS now uses stack_core code to parse traces.
2014-07-09 01:28:20 +00:00
Elliott Hughes
a97f675c92
am 1b1840cb: am af95db03: Merge "ADBS now uses stack_core code to parse traces."
...
* commit '1b1840cbef77f2abfe95af56bc927c647a693429':
ADBS now uses stack_core code to parse traces.
2014-07-08 20:15:39 +00:00
Raph Levien
093d04c631
Add Zopfli-recompress option to zipalign
...
Zopfli provides compression roughly 5% better than zlib, while remaining
completely compatible with zlib decoders. This patch adds a "-z" option
to zipalign, recompressing all compressed files within the zip archive.
Change-Id: If177ca4b82ec701b7446861b2cfe08c6bd403813
2014-07-07 16:03:49 -07:00
Brigid Smith
90c66cff3a
ADBS now uses stack_core code to parse traces.
...
Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
2014-07-07 15:14:41 -07:00
Ying Wang
00c67a0568
Fix typo.
...
Bug: 15978907
Bug: 15018047
Change-Id: I6250bb6d67af8c612283541efe0e2120077ad2fb
2014-06-30 18:01:46 -07:00
JP Abgrall
1207d5e02b
Merge "releasetools: only allow yaffs to have no userdata image size (fix build)"
2014-06-27 15:56:14 +00:00
JP Abgrall
4d09dcb2c6
releasetools: only allow yaffs to have no userdata image size (fix build)
...
In the past, there was an exception for ext-base fs types to
deal with the lack of image size.
Back then it was only yaffs and ext*.
So now we explicitely only allow yaffs to have no userdata image size.
Change-Id: Ie354ee6222a58228dbcce2c6934971a0737422af
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-26 21:15:39 -07:00
Dirk Dougherty
80b97e1c19
am 23673843: Doc change: add query param to force refresh in proxy caches.
...
* commit '236738439acab7c9b2afc2725b44c4867597ed7f':
Doc change: add query param to force refresh in proxy caches.
2014-06-26 21:09:09 +00:00
Dirk Dougherty
236738439a
Doc change: add query param to force refresh in proxy caches.
...
Change-Id: I7bbec536bba7878ef9b5fdc91a25a47437e276ed
2014-06-26 13:07:57 -07:00
Colin Cross
d00c0a2e20
HACK: report CPU abi as 2nd arch if present
...
Workaround to report armv7 abis for arm64 devices until the play store
looks at the new android.os.Build.SUPPORTED_ABIS list.
Bug: 15018047
Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
2014-06-27 10:49:26 -07:00
Dirk Dougherty
43da4342d2
am 80b97e1c: am 23673843: Doc change: add query param to force refresh in proxy caches.
...
* commit '80b97e1c193687d74a93e9f9b365ba11838817df':
Doc change: add query param to force refresh in proxy caches.
2014-06-26 21:14:40 +00:00
Robert Ly
3cbf635856
am 13c416be: am 28d695a0: css changes for index page card
...
* commit '13c416be55329150bbfefe2a51ae05c8c832db84':
css changes for index page card
2014-06-26 10:31:01 +00:00
Robert Ly
4e8b404300
am 8a782585: am a34ef028: Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
...
* commit '8a78258526e49957d285c48ddba5a8de64774256':
docs: Updating download dir for ADT 23.0.0 links to new location
2014-06-26 10:31:00 +00:00
Robert Ly
13c416be55
am 28d695a0: css changes for index page card
...
* commit '28d695a0051af88d72cd025cdd3df01ae5fffed1':
css changes for index page card
2014-06-26 09:50:21 +00:00
Robert Ly
8a78258526
am a34ef028: Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
...
* commit 'a34ef028a00192877209281490a468c29cdacd40':
docs: Updating download dir for ADT 23.0.0 links to new location
2014-06-26 09:49:40 +00:00
Robert Ly
28d695a005
css changes for index page card
...
Change-Id: I4fca8284acf50ad05bf9c06ada0daa636b3e9e6f
2014-06-25 22:50:49 -07:00
smain@google.com
bd7b23e403
am 0858c65a: am 5771ee3c: add style for stand-alone back link with left arrow
...
* commit '0858c65a4d2e9cda9b9a6017bc1f4bf32125cafc':
add style for stand-alone back link with left arrow
2014-06-25 23:21:00 +00:00
smain@google.com
0858c65a4d
am 5771ee3c: add style for stand-alone back link with left arrow
...
* commit '5771ee3c41afc7024ca8c76c7b8deef3798d0bcd':
add style for stand-alone back link with left arrow
2014-06-25 22:23:02 +00:00
smain@google.com
5771ee3c41
add style for stand-alone back link with left arrow
...
Change-Id: Ia9219e3e77ef23c6bf6374244c57c4c7e8d1f386
2014-06-25 15:12:52 -07:00
smain@google.com
4bc8177434
am e022e9a7: am bb9ecf42: undo the butterbar change, because automerger is ruthless
...
* commit 'e022e9a7139a55ed8d9fcc9dca3ffdf37727b164':
undo the butterbar change, because automerger is ruthless
2014-06-25 20:45:52 +00:00
smain@google.com
e022e9a713
am bb9ecf42: undo the butterbar change, because automerger is ruthless
...
* commit 'bb9ecf420f136681a3bd4d5503207733b4dc283b':
undo the butterbar change, because automerger is ruthless
2014-06-25 19:12:42 +00:00
Clay Murphy
0e9f646d39
Merge "Docs: Replacing s.a.c. Android logo to match other sites."
2014-06-25 17:34:07 +00:00
smain@google.com
bb9ecf420f
undo the butterbar change, because automerger is ruthless
...
Change-Id: If9953c9c7af1250a26a74691d8aac58808595c85
2014-06-24 18:43:36 -07:00
smain@google.com
0b65bf6b1b
am 58b617b9: am cd59b7df: am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
...
* commit '58b617b902e5a9aa8c0367c894fefa747ea1b5e6':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
2014-06-25 00:27:58 +00:00
smain@google.com
e401cf2c7f
am c26839a9: am cfb92aa9: add a smaller version of the device frame for wear
...
* commit 'c26839a901a1ea395a62bb82407c1316e281c52a':
add a smaller version of the device frame for wear
2014-06-25 00:27:54 +00:00