Alex Klyubin
346a716b87
Merge \\"More general OutputStreamDataSink.\\" am: dca955a9bd
...
am: 58c8559979
2016-06-13 20:06:33 +00:00
Alex Klyubin
58c8559979
Merge \"More general OutputStreamDataSink.\"
...
am: dca955a9bd
2016-06-13 20:02:12 +00:00
Alex Klyubin
dca955a9bd
Merge "More general OutputStreamDataSink."
2016-06-13 19:49:01 +00:00
Alex Klyubin
d3ca5e8184
Merge \\\"Fix inefficiency in APK entry data alignment.\\\" am: a85e0aa883 am: 7fe6ba2197
...
am: 876080b437
2016-06-13 18:29:53 +00:00
Alex Klyubin
876080b437
Merge \\"Fix inefficiency in APK entry data alignment.\\" am: a85e0aa883
...
am: 7fe6ba2197
2016-06-13 18:26:05 +00:00
Alex Klyubin
7fe6ba2197
Merge \"Fix inefficiency in APK entry data alignment.\"
...
am: a85e0aa883
2016-06-13 18:22:19 +00:00
Alex Klyubin
a85e0aa883
Merge "Fix inefficiency in APK entry data alignment."
2016-06-13 18:14:18 +00:00
Alex Klyubin
e54b2753e4
More general OutputStreamDataSink.
...
This replaces the less general DataSink which outputs into a
ByteArrayOutputStream with a more general DataSink which outputs into
an OutputStream.
Bug: 27461702
Change-Id: I9467f38c41f586b71f35edb3602fd6e57153184f
2016-06-13 10:19:26 -07:00
Tao Bao
293fd135c7
releasetools: Disable using imgdiff for squashfs.
...
We use imgdiff to handle files in zip format (e.g. jar/zip/apk) for
higher compression ratio.
For system/vendor in squashfs, a) all files are compressed in LZ4
format; b) we use 4096-byte block size in their sparse images, but the
files in squashfs may not be laid out as 4K-aligned. So the blocks for
a given file as listed in block map may not form a valid zip file, which
may fail the patch generation with imgdiff.
Disable using imgdiff for squashfs images, and use bsdiff instead.
Bug: 22322817
Change-Id: Ie76aa4cece5c9d38cb1d1a34c505a4a8f37512d3
2016-06-13 10:04:23 -07:00
Tao Bao
f2edbceb76
Merge \"Track the name change for wipe_ab.\" into nyc-mr1-dev
...
am: 943f19868a
2016-06-13 16:50:47 +00:00
Mohamad Ayyash
c3484f7f64
Pass block_list param to mksquashfs
...
Needed to generate image.map and to optimize the OTA size
BUG: 22322817
Change-Id: I7802f4dbb9116a94ea99a00b68c3a7ff180ef08a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2016-06-13 09:48:05 -07:00
Tao Bao
943f19868a
Merge "Track the name change for wipe_ab." into nyc-mr1-dev
2016-06-13 16:43:46 +00:00
David Zeuthen
029f3fe2f4
Merge \\\"bvb: Update path to key since repo was moved.\\\" am: 8b3b1727da am: 8ab7487660
...
am: a787117cc5
2016-06-13 16:11:27 +00:00
David Zeuthen
a787117cc5
Merge \\"bvb: Update path to key since repo was moved.\\" am: 8b3b1727da
...
am: 8ab7487660
2016-06-13 16:06:54 +00:00
David Zeuthen
8ab7487660
Merge \"bvb: Update path to key since repo was moved.\"
...
am: 8b3b1727da
2016-06-13 16:03:11 +00:00
David Zeuthen
8b3b1727da
Merge "bvb: Update path to key since repo was moved."
2016-06-13 15:54:36 +00:00
David Zeuthen
bca24302bb
bvb: Update path to key since repo was moved.
...
We recently moved Brillo verified boot from system/bvb to external/bvb
so update the path accordingly.
TEST=Build with 'BOARD_BVB_ENABLE := true' succeeds.
BUG=29099910
Change-Id: I66f3b90e23d6b2afc09f81af571ede7b573325e9
2016-06-13 11:26:26 -04:00
Yohann Roussel
370ff7f9d1
Merge \\\"Do not force turn off of Jack warning\\\" am: 0a26fc0ace am: 5185323de9
...
am: 9530d9131c
2016-06-13 14:52:57 +00:00
Yohann Roussel
9530d9131c
Merge \\"Do not force turn off of Jack warning\\" am: 0a26fc0ace
...
am: 5185323de9
2016-06-13 14:48:53 +00:00
Yohann Roussel
5185323de9
Merge \"Do not force turn off of Jack warning\"
...
am: 0a26fc0ace
2016-06-13 14:44:56 +00:00
Yohann Roussel
0a26fc0ace
Merge "Do not force turn off of Jack warning"
2016-06-13 14:33:48 +00:00
Alex Klyubin
ab2a3b0061
Fix inefficiency in APK entry data alignment.
...
26f00cda4b
2016-06-11 17:47:20 -07:00
Alex Deymo
361cc8c8e0
Merge \\\"Redirect subprocess stderr to stdout in verbose mode.\\\" am: 1318ec93e7 am: 74d7b31f7d
...
am: dbae67fac8
2016-06-11 01:15:42 +00:00
Alex Deymo
dbae67fac8
Merge \\"Redirect subprocess stderr to stdout in verbose mode.\\" am: 1318ec93e7
...
am: 74d7b31f7d
2016-06-11 01:12:06 +00:00
Alex Deymo
74d7b31f7d
Merge \"Redirect subprocess stderr to stdout in verbose mode.\"
...
am: 1318ec93e7
2016-06-11 01:08:11 +00:00
Treehugger Robot
1318ec93e7
Merge "Redirect subprocess stderr to stdout in verbose mode."
2016-06-11 00:56:32 +00:00
Alex Deymo
d8d96ecdae
Redirect subprocess stderr to stdout in verbose mode.
...
This patch uses subprocess.communicate instead of subprocess.wait to
prevent deadlock if any of the child processes outputs too much data,
and redirects the subprocess output to stdout when running in verbose
mode.
With this patch `ota_from_target_files -v` prints the delta_generator
output in stdout, and no output if '-v' is not passed.
Bug: None
TEST=ota_from_target_files -v ...
Change-Id: Id66e4f3360a6f91d61a3ce96d53afbccdaa19da5
2016-06-10 16:38:31 -07:00
Nick Kralevich
7e98274608
Merge \\\"goldfish_setup: grant /system/bin/sh exec access\\\" am: 7a866d783c am: 0db549d72c
...
am: 53896ca942
2016-06-10 18:22:04 +00:00
David Turner
53896ca942
Merge \\"goldfish_setup: grant /system/bin/sh exec access\\" am: 7a866d783c
...
am: 0db549d72c
2016-06-10 18:18:37 +00:00
Nick Kralevich
0db549d72c
Merge \"goldfish_setup: grant /system/bin/sh exec access\"
...
am: 7a866d783c
2016-06-10 18:15:13 +00:00
David Turner
7a866d783c
Merge "goldfish_setup: grant /system/bin/sh exec access"
2016-06-10 18:04:26 +00:00
Tianjie Xu
8f08683e06
Add build.version.incremental to metadata am: d06f07eef4
...
am: 21c8d29ee1
2016-06-10 17:37:02 +00:00
Tianjie Xu
884e274103
Add build.version.incremental to metadata am: d06f07eef4
...
am: c201d28713
2016-06-10 17:30:30 +00:00
Tianjie Xu
21c8d29ee1
Add build.version.incremental to metadata
...
am: d06f07eef4
2016-06-10 17:30:29 +00:00
Tianjie Xu
c201d28713
Add build.version.incremental to metadata
...
am: d06f07eef4
2016-06-10 17:24:52 +00:00
Tao Bao
c3c17534da
Track the name change for wipe_ab.
...
Bug: 27253717
Change-Id: I0d4c91e99267afdc4846ea50e602a2383898b9b4
2016-06-10 10:14:14 -07:00
Tianjie Xu
d06f07eef4
Add build.version.incremental to metadata
...
Add the build property "build.version.incremental" of the source (if
present) and target files to the metadata of the ota update package.
Example of metadata:
....
post-build-incremental=2951741
post-timestamp=1465345123
pre-build-incremental=2943039
pre-device=bullhead
...
Bug: 28658632
Change-Id: I889e8ccf39633b1b35590751001a42d1b05d5514
2016-06-09 17:54:46 -07:00
Vineeta Srivastava
1d229180f2
Whitelist verizon as local module owner.
...
am: 323f0f9407
2016-06-09 19:41:37 +00:00
Vineeta Srivastava
323f0f9407
Whitelist verizon as local module owner.
...
Change-Id: I807ac61688e6f5862de521e3c9b960dd64eed1f6
2016-06-09 11:12:52 -07:00
Nick Kralevich
03bfdea1a3
goldfish_setup: grant /system/bin/sh exec access
...
The goldfish_setup shell script needs the ability to execute
the shell script interpreter. Allow it.
Addresses the following denial:
avc: denied { getattr } for pid=1220 comm="init.goldfish.s"
path="/system/bin/sh" dev="vda" ino=442 scontext=u:r:goldfish_setup:s0
tcontext=u:object_r:shell_exec:s0 tclass=file permissive=0
(cherrypicked from commit 501c88c029
2016-06-09 09:52:39 -07:00
Vikas Marwaha
589ed96538
resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp
...
am: 98dce87fe1
2016-06-09 05:55:13 +00:00
Vikas Marwaha
98dce87fe1
resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp
...
Change-Id: Iae0444b9e9e7b4db3bfd94f5712e22aa08a122b5
2016-06-09 05:46:40 +00:00
Vikas Marwaha
07886f17af
Merge \"Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only product property ro.product.first_api_level.\"
...
am: e5c1af2dd0
2016-06-09 02:38:50 +00:00
Vikas Marwaha
e5c1af2dd0
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only product property ro.product.first_api_level."
2016-06-09 02:30:57 +00:00
Dan Willemsen
4aff13e769
Merge \\\"Rewrite LDLIBS and SHARED_LIBRARIES\\\" am: a8d13592ac am: d8210177af
...
am: 74da7c9272
2016-06-08 21:20:03 +00:00
Dan Willemsen
74da7c9272
Merge \\"Rewrite LDLIBS and SHARED_LIBRARIES\\" am: a8d13592ac
...
am: d8210177af
2016-06-08 21:17:05 +00:00
Dan Willemsen
d8210177af
Merge \"Rewrite LDLIBS and SHARED_LIBRARIES\"
...
am: a8d13592ac
2016-06-08 21:14:36 +00:00
Dan Willemsen
a8d13592ac
Merge "Rewrite LDLIBS and SHARED_LIBRARIES"
2016-06-08 21:09:34 +00:00
Alex Klyubin
d6d295f663
Merge \\\"APK Signature Scheme v2 APK verifier.\\\" am: 4f8bde47ae am: 9cf15a318b
...
am: 42c4f541ae
2016-06-08 21:09:28 +00:00
Alex Klyubin
42c4f541ae
Merge \\"APK Signature Scheme v2 APK verifier.\\" am: 4f8bde47ae
...
am: 9cf15a318b
2016-06-08 21:06:41 +00:00
