OSDN Git Service
Mohamad Ayyash [Wed, 15 Jun 2016 17:35:57 +0000 (17:35 +0000)]
Merge \\\"Pass block_list param to mksquashfs\\\" into nyc-dev am:
3bddf74752 am:
f80e55b821
am:
9a78882be1
Change-Id: I52f9371f84e7fcb750a9e00eeb44de62b344cc96
Tao Bao [Wed, 15 Jun 2016 17:35:56 +0000 (17:35 +0000)]
Merge \\\"releasetools: Disable using imgdiff for squashfs.\\\" into nyc-dev am:
a8d3741f1a am:
df56506d30
am:
8f445cf814
Change-Id: I53821c7420491bfd173d497992fb03565eb0605a
Mohamad Ayyash [Wed, 15 Jun 2016 17:35:56 +0000 (17:35 +0000)]
Merge \\\"Pass block_list param to mksquashfs\\\" into nyc-dev am:
3bddf74752 am:
52cef0d4f0
am:
c3216ac077
Change-Id: I8782f322fccc16f39a9932ab1fb88bd246143e6e
Tao Bao [Wed, 15 Jun 2016 17:35:52 +0000 (17:35 +0000)]
Merge \\\"releasetools: Disable using imgdiff for squashfs.\\\" into nyc-dev am:
a8d3741f1a am:
46ff838582
am:
b54038689e
Change-Id: Ib326b63197c9eb4a7851445011f3dfdceabfc0e3
Mohamad Ayyash [Wed, 15 Jun 2016 17:07:03 +0000 (17:07 +0000)]
Merge \\"Pass block_list param to mksquashfs\\" into nyc-dev am:
3bddf74752
am:
f80e55b821
Change-Id: I8a51cf585da2a06b775de7b2be31986a54bf460f
Mohamad Ayyash [Wed, 15 Jun 2016 17:07:03 +0000 (17:07 +0000)]
Merge \\"releasetools: Disable using imgdiff for squashfs.\\" into nyc-dev am:
a8d3741f1a
am:
df56506d30
Change-Id: I13ca173094d0fad8e5a4db592ef11e54345aa11d
Mohamad Ayyash [Wed, 15 Jun 2016 17:02:47 +0000 (17:02 +0000)]
Merge \\"Pass block_list param to mksquashfs\\" into nyc-dev am:
3bddf74752
am:
52cef0d4f0
Change-Id: I0fe16c6b9728acf7b46f412d705fa0aacd2b4655
Mohamad Ayyash [Wed, 15 Jun 2016 17:02:44 +0000 (17:02 +0000)]
Merge \\"releasetools: Disable using imgdiff for squashfs.\\" into nyc-dev am:
a8d3741f1a
am:
46ff838582
Change-Id: I8e0e9f9b116da0b07ad89968eb8346aa1a0f04a8
Mohamad Ayyash [Wed, 15 Jun 2016 16:58:36 +0000 (16:58 +0000)]
Merge \"Pass block_list param to mksquashfs\" into nyc-dev
am:
3bddf74752
Change-Id: I713c6a60d10ef1e85475e462bb34c89751f74e7d
Tao Bao [Wed, 15 Jun 2016 16:58:35 +0000 (16:58 +0000)]
Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
am:
a8d3741f1a
Change-Id: Iec58dd45df569d4c558ed0114b576db0f5cb101a
Mohamad Ayyash [Wed, 15 Jun 2016 16:12:55 +0000 (16:12 +0000)]
Merge \"Pass block_list param to mksquashfs\" into nyc-dev
am:
3bddf74752
Change-Id: I1679c255b297a36bc10b50ff9d6214c92d763489
Tao Bao [Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)]
Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
am:
a8d3741f1a
Change-Id: If8392b72a865f53449a1d5ca7b52de7697c4b412
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge "Pass block_list param to mksquashfs" into nyc-dev
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge "releasetools: Disable using imgdiff for squashfs." into nyc-dev
Alex Klyubin [Tue, 14 Jun 2016 23:04:29 +0000 (23:04 +0000)]
Merge \\\\"Faster and cleaner way to obtain UTF-8 encoded form.\\\\" am:
98b4f07dfc am:
5e8b2c9207 am:
e000bb9be6
am:
a266acdfc4
Change-Id: I9e2cf2e4b4cf924857f1ae0c92d67710e9748aee
Dan Willemsen [Tue, 14 Jun 2016 23:04:28 +0000 (23:04 +0000)]
Merge \\\\"Use more prebuilt build-tools\\\\" am:
6c0c720389 am:
ffb643e487 am:
4ed18f541e
am:
be751987ef
Change-Id: I86bf3062575577fde9d9479520a4a3179bc41926
Alex Klyubin [Tue, 14 Jun 2016 22:46:09 +0000 (22:46 +0000)]
Merge \\\"Faster and cleaner way to obtain UTF-8 encoded form.\\\" am:
98b4f07dfc am:
5e8b2c9207
am:
e000bb9be6
Change-Id: I145e78f5a16c10c9bf645476f71222a5ef8ab448
Alex Klyubin [Tue, 14 Jun 2016 22:43:35 +0000 (22:43 +0000)]
Merge \\"Faster and cleaner way to obtain UTF-8 encoded form.\\" am:
98b4f07dfc
am:
5e8b2c9207
Change-Id: I48bc0772fcb1acf050d04f650c1b0eca8a6c79cb
Alex Klyubin [Tue, 14 Jun 2016 22:41:02 +0000 (22:41 +0000)]
Merge \"Faster and cleaner way to obtain UTF-8 encoded form.\"
am:
98b4f07dfc
Change-Id: Ic5e071d01ea0fd9a091097e3659f16c0b71f5ae6
Treehugger Robot [Tue, 14 Jun 2016 22:37:10 +0000 (22:37 +0000)]
Merge "Faster and cleaner way to obtain UTF-8 encoded form."
Dan Willemsen [Tue, 14 Jun 2016 22:35:55 +0000 (22:35 +0000)]
Merge \\\"Use more prebuilt build-tools\\\" am:
6c0c720389 am:
ffb643e487
am:
4ed18f541e
Change-Id: I654f603c67ab482fa53225b4bcb16a68183fb057
Dan Willemsen [Tue, 14 Jun 2016 22:33:19 +0000 (22:33 +0000)]
Merge \\"Use more prebuilt build-tools\\" am:
6c0c720389
am:
ffb643e487
Change-Id: I4cdec816470a05193c4c303f3c6343815f2b671c
Dan Willemsen [Tue, 14 Jun 2016 22:28:02 +0000 (22:28 +0000)]
Merge \"Use more prebuilt build-tools\"
am:
6c0c720389
Change-Id: Icb67388bf084f2de872e9df8747b70cbde42b5f9
Treehugger Robot [Tue, 14 Jun 2016 22:14:06 +0000 (22:14 +0000)]
Merge "Use more prebuilt build-tools"
Alex Klyubin [Tue, 14 Jun 2016 21:21:16 +0000 (21:21 +0000)]
Merge \\\\"APK JAR signature verifier.\\\\" am:
cf89865b95 am:
d1af20e103 am:
3836690d20
am:
981b2e4a6c
Change-Id: I117187cb390afb7a2814187f09d7a4911f0d1325
Alex Klyubin [Tue, 14 Jun 2016 21:18:21 +0000 (14:18 -0700)]
Faster and cleaner way to obtain UTF-8 encoded form.
Instead of specifying character encoding by name, the faster, cleaner,
and safer way is to use StandardCharsets.UTF_8.
Bug:
27461702
Change-Id: I897284d3ceeb44a21cc74de09a9b25f6aec8c205
Alex Klyubin [Tue, 14 Jun 2016 21:15:51 +0000 (21:15 +0000)]
Merge \\\"APK JAR signature verifier.\\\" am:
cf89865b95 am:
d1af20e103
am:
3836690d20
Change-Id: I1205f44b5f0b1101a91f41c766666510056fc597
Alex Klyubin [Tue, 14 Jun 2016 21:05:45 +0000 (21:05 +0000)]
Merge \\"APK JAR signature verifier.\\" am:
cf89865b95
am:
d1af20e103
Change-Id: I7cae6cda81bebf10b7abf3175d428452620e83bf
Alex Klyubin [Tue, 14 Jun 2016 21:03:04 +0000 (21:03 +0000)]
Merge \"APK JAR signature verifier.\"
am:
cf89865b95
Change-Id: If54865fdf6d290ab38a3f6a0f3eec2142c55e8d0
Alex Klyubin [Tue, 14 Jun 2016 20:56:27 +0000 (20:56 +0000)]
Merge "APK JAR signature verifier."
Dan Willemsen [Mon, 6 Jun 2016 21:44:00 +0000 (14:44 -0700)]
Use more prebuilt build-tools
For acp, we've been using an old prebuilt in prebuilts/sdk, but it's not
part of the SDK. Instead, we'll use a prebuilt in the build-tools
repository.
For ijar, we've been using the host libstdc++ to workaround the lack of
libc++ on some unbundled branches. Instead, use a prebuilt that can use
libc++.
For ziptime, we've been disabling it on unbundled branches, due to the
lack of libc++. Instead, use a prebuilt version of ziptime that can use
the prebuilt libc++.
Change-Id: If80f845ea06f76e3fe6765964e77c864eaf303d0
Dan Willemsen [Tue, 14 Jun 2016 20:46:58 +0000 (20:46 +0000)]
Merge \\\\"Add a libc++ version of ijar for prebuilt use\\\\" am:
06f3e8349f am:
38ff3ae039 am:
2bebbb485a
am:
6f2e3c89eb
Change-Id: I8793a25f9f39228b1f92e9832cffb2a5d32be147
Jeff Hao [Tue, 14 Jun 2016 20:46:57 +0000 (20:46 +0000)]
Merge \\\\"Skip uses-library check for preopted apps.\\\\" am:
7b4c07f1d5 am:
baf8869991 am:
d546f767fa
am:
17b7f12106
Change-Id: I5b1f91e4bf7fd2908f2e6b3d62f9e616e546998a
Dan Willemsen [Tue, 14 Jun 2016 20:30:53 +0000 (20:30 +0000)]
Merge \\\"Add a libc++ version of ijar for prebuilt use\\\" am:
06f3e8349f am:
38ff3ae039
am:
2bebbb485a
Change-Id: Iedeb86c8e956499f588348cf3f49b6d9bdb28844
Jeff Hao [Tue, 14 Jun 2016 20:30:52 +0000 (20:30 +0000)]
Merge \\\"Skip uses-library check for preopted apps.\\\" am:
7b4c07f1d5 am:
baf8869991
am:
d546f767fa
Change-Id: If57c340e52372d9b654e5cf99d057dd61f37e030
Dan Willemsen [Tue, 14 Jun 2016 20:28:24 +0000 (20:28 +0000)]
Merge \\"Add a libc++ version of ijar for prebuilt use\\" am:
06f3e8349f
am:
38ff3ae039
Change-Id: I83c7313db392a137b0d54232d4f122b54120ce2a
Jeff Hao [Tue, 14 Jun 2016 20:28:22 +0000 (20:28 +0000)]
Merge \\"Skip uses-library check for preopted apps.\\" am:
7b4c07f1d5
am:
baf8869991
Change-Id: Id14f3aca9e19d900deb31ce35292810f9d35fafe
Dan Willemsen [Tue, 14 Jun 2016 20:04:21 +0000 (20:04 +0000)]
Merge \"Add a libc++ version of ijar for prebuilt use\"
am:
06f3e8349f
Change-Id: I284c7c85de71551e608e4210ab71b17e36229e09
Jeff Hao [Tue, 14 Jun 2016 20:04:20 +0000 (20:04 +0000)]
Merge \"Skip uses-library check for preopted apps.\"
am:
7b4c07f1d5
Change-Id: I6e027842b3eb70b333efd20ccf6798e88baef436
Treehugger Robot [Tue, 14 Jun 2016 18:34:38 +0000 (18:34 +0000)]
Merge "Add a libc++ version of ijar for prebuilt use"
Dan Willemsen [Tue, 14 Jun 2016 17:30:06 +0000 (10:30 -0700)]
Add a libc++ version of ijar for prebuilt use
I'll remove the old version once we've moved over to the prebuilts.
Change-Id: Ifd8d396f8b653abbe958cd34e69831a6ca378649
Alex Klyubin [Wed, 8 Jun 2016 21:54:28 +0000 (14:54 -0700)]
APK JAR signature verifier.
This adds JAR signature verification to ApkVerifier.
Bug:
27461702
Change-Id: Id2b72bea7869be66268f6bc1387e1559ee02ff9d
Treehugger Robot [Tue, 14 Jun 2016 17:22:25 +0000 (17:22 +0000)]
Merge "Skip uses-library check for preopted apps."
Jeff Hao [Tue, 14 Jun 2016 02:25:56 +0000 (02:25 +0000)]
Merge \"Skip uses-library check for preopted apps. am:
b00263f96a am:
23fde1f020\" into nyc-mr1-dev-plus-aosp
am:
3247ddcd4a
Change-Id: I8e088b8a503d38867df08d149052a42336ee3a6e
Jeff Hao [Tue, 14 Jun 2016 02:25:55 +0000 (02:25 +0000)]
Skip uses-library check for preopted apps. am:
b00263f96a am:
7d49d21ac5
am:
04c023d1c0
Change-Id: I377cf2a76b39230836cbdf088bfbc4f381967d13
Android Build Merger (Role) [Tue, 14 Jun 2016 02:20:57 +0000 (02:20 +0000)]
Merge "Skip uses-library check for preopted apps. am:
b00263f96a am:
23fde1f020" into nyc-mr1-dev-plus-aosp
Jeff Hao [Tue, 14 Jun 2016 02:20:48 +0000 (02:20 +0000)]
Skip uses-library check for preopted apps. am:
b00263f96a
am:
7d49d21ac5
Change-Id: Ia8645d947c6c900cfab8d4cd4630d5cbd491cdc2
Jeff Hao [Tue, 14 Jun 2016 02:20:47 +0000 (02:20 +0000)]
Skip uses-library check for preopted apps. am:
b00263f96a
am:
23fde1f020
Change-Id: I1a395efc2b713ef69da3ae6ada79ae11cf983413
Jeff Hao [Tue, 14 Jun 2016 02:15:53 +0000 (02:15 +0000)]
Skip uses-library check for preopted apps.
am:
b00263f96a
Change-Id: Icc9170bc494750eac12f141e7afd09d36564a2cc
Jeff Hao [Tue, 14 Jun 2016 02:15:40 +0000 (02:15 +0000)]
Skip uses-library check for preopted apps.
am:
b00263f96a
Change-Id: I216faedc383fa289df564ba73e7ae093dad1517c
Yabin Cui [Tue, 14 Jun 2016 01:34:05 +0000 (01:34 +0000)]
Merge \\\\"Add option to link static lite protobuf library.\\\\" am:
e6fae50455 am:
bebdc16a68 am:
494c2b5ebc
am:
eaba2805ef
Change-Id: Id325e69a4a4af70dac3fe4aa0f3e6b833889449e
Yabin Cui [Tue, 14 Jun 2016 01:29:35 +0000 (01:29 +0000)]
Merge \\\"Add option to link static lite protobuf library.\\\" am:
e6fae50455 am:
bebdc16a68
am:
494c2b5ebc
Change-Id: I5095a1a45169ed9d233d38b5d7a70040e54ff990
Yabin Cui [Tue, 14 Jun 2016 01:24:05 +0000 (01:24 +0000)]
Merge \\"Add option to link static lite protobuf library.\\" am:
e6fae50455
am:
bebdc16a68
Change-Id: I60b9fb9437fe15079c62c3d47401341b54ebc7bc
Jeff Hao [Mon, 13 Jun 2016 23:53:11 +0000 (16:53 -0700)]
Skip uses-library check for preopted apps.
Bug:
26880306
(cherry-picked from commit
b00263f96a90c9f77cf7d8d90742a0884290bf60)
Change-Id: I22beccaf61ca30cf1487a25f80e1c3fd7bdf2c62
Jeff Hao [Mon, 13 Jun 2016 23:53:11 +0000 (16:53 -0700)]
Skip uses-library check for preopted apps.
Bug:
26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
Yabin Cui [Tue, 14 Jun 2016 00:25:05 +0000 (00:25 +0000)]
Merge \"Add option to link static lite protobuf library.\"
am:
e6fae50455
Change-Id: Idcc3c54033724a9cef17a219b4c118689eaad297
Yabin Cui [Tue, 14 Jun 2016 00:16:34 +0000 (00:16 +0000)]
Merge "Add option to link static lite protobuf library."
Alex Klyubin [Mon, 13 Jun 2016 20:14:11 +0000 (20:14 +0000)]
Merge \\\\"More general OutputStreamDataSink.\\\\" am:
dca955a9bd am:
58c8559979 am:
346a716b87
am:
55b6b60cad
Change-Id: I93b9fbbadb63189a17a81a5cdcf8729b6e24b244
Alex Klyubin [Mon, 13 Jun 2016 20:10:27 +0000 (20:10 +0000)]
Merge \\\"More general OutputStreamDataSink.\\\" am:
dca955a9bd am:
58c8559979
am:
346a716b87
Change-Id: Id7f0604064d7d8b04c22b3be8cbbe87dd51a3c3a
Alex Klyubin [Mon, 13 Jun 2016 20:06:33 +0000 (20:06 +0000)]
Merge \\"More general OutputStreamDataSink.\\" am:
dca955a9bd
am:
58c8559979
Change-Id: I1caf9f4ae2650dfadcb003315c12a30a3288fd4f
Alex Klyubin [Mon, 13 Jun 2016 20:02:12 +0000 (20:02 +0000)]
Merge \"More general OutputStreamDataSink.\"
am:
dca955a9bd
Change-Id: Id94e07f6007c3288c0501d6cd9017680108e4dbf
Alex Klyubin [Mon, 13 Jun 2016 19:49:01 +0000 (19:49 +0000)]
Merge "More general OutputStreamDataSink."
Alex Klyubin [Mon, 13 Jun 2016 18:34:15 +0000 (18:34 +0000)]
Merge \\\\"Fix inefficiency in APK entry data alignment.\\\\" am:
a85e0aa883 am:
7fe6ba2197 am:
876080b437
am:
d3ca5e8184
Change-Id: I89d3235108a4a34ddedc190cb1e7a75a70139a7b
Alex Klyubin [Mon, 13 Jun 2016 18:29:53 +0000 (18:29 +0000)]
Merge \\\"Fix inefficiency in APK entry data alignment.\\\" am:
a85e0aa883 am:
7fe6ba2197
am:
876080b437
Change-Id: I39767c9bb532c111d6827589da3299fccb3f6211
Alex Klyubin [Mon, 13 Jun 2016 18:26:05 +0000 (18:26 +0000)]
Merge \\"Fix inefficiency in APK entry data alignment.\\" am:
a85e0aa883
am:
7fe6ba2197
Change-Id: I97934b2a4cdfabb463f5012149ef28a15768c321
Alex Klyubin [Mon, 13 Jun 2016 18:22:19 +0000 (18:22 +0000)]
Merge \"Fix inefficiency in APK entry data alignment.\"
am:
a85e0aa883
Change-Id: I8c1b8116ab66c83e9b73f103adaf6237e51a6c1f
Alex Klyubin [Mon, 13 Jun 2016 18:14:18 +0000 (18:14 +0000)]
Merge "Fix inefficiency in APK entry data alignment."
Alex Klyubin [Mon, 13 Jun 2016 17:19:26 +0000 (10:19 -0700)]
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
Tao Bao [Sat, 11 Jun 2016 19:19:23 +0000 (12:19 -0700)]
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
Tao Bao [Mon, 13 Jun 2016 16:54:19 +0000 (16:54 +0000)]
Merge \\"Track the name change for wipe_ab.\\" into nyc-mr1-dev am:
943f19868a
am:
f2edbceb76
Change-Id: I7f28823c50f2d31c8c53d8885b92bda0a6b39f16
Tao Bao [Mon, 13 Jun 2016 16:50:47 +0000 (16:50 +0000)]
Merge \"Track the name change for wipe_ab.\" into nyc-mr1-dev
am:
943f19868a
Change-Id: I1e760f39750b1decdb8a13a7697a82e845027036
Mohamad Ayyash [Mon, 13 Jun 2016 16:46:58 +0000 (09:46 -0700)]
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>
Tao Bao [Mon, 13 Jun 2016 16:43:44 +0000 (16:43 +0000)]
Merge "Track the name change for wipe_ab." into nyc-mr1-dev
David Zeuthen [Mon, 13 Jun 2016 16:15:16 +0000 (16:15 +0000)]
Merge \\\\"bvb: Update path to key since repo was moved.\\\\" am:
8b3b1727da am:
8ab7487660 am:
a787117cc5
am:
029f3fe2f4
Change-Id: I956701e2f11b5b3310d7e095695ffa0a8e6cae60
David Zeuthen [Mon, 13 Jun 2016 16:11:27 +0000 (16:11 +0000)]
Merge \\\"bvb: Update path to key since repo was moved.\\\" am:
8b3b1727da am:
8ab7487660
am:
a787117cc5
Change-Id: I564533914e0267411a0aa363735222845cc0e38f
David Zeuthen [Mon, 13 Jun 2016 16:06:54 +0000 (16:06 +0000)]
Merge \\"bvb: Update path to key since repo was moved.\\" am:
8b3b1727da
am:
8ab7487660
Change-Id: I04b9b35c392b6e99b15f4c78358c70c9a9794532
David Zeuthen [Mon, 13 Jun 2016 16:03:11 +0000 (16:03 +0000)]
Merge \"bvb: Update path to key since repo was moved.\"
am:
8b3b1727da
Change-Id: I0256523824d49aa59ba61eec18b85a9a2a9324d2
David Zeuthen [Mon, 13 Jun 2016 15:54:36 +0000 (15:54 +0000)]
Merge "bvb: Update path to key since repo was moved."
David Zeuthen [Mon, 13 Jun 2016 15:26:26 +0000 (11:26 -0400)]
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
Yohann Roussel [Mon, 13 Jun 2016 14:56:39 +0000 (14:56 +0000)]
Merge \\\\"Do not force turn off of Jack warning\\\\" am:
0a26fc0ace am:
5185323de9 am:
9530d9131c
am:
370ff7f9d1
Change-Id: I4f32ddd84f64bdd3a5748514a9e29624d857b9a2
Yohann Roussel [Mon, 13 Jun 2016 14:52:57 +0000 (14:52 +0000)]
Merge \\\"Do not force turn off of Jack warning\\\" am:
0a26fc0ace am:
5185323de9
am:
9530d9131c
Change-Id: I04afeabcaad279368f8e0eabbb7d257ebf1a8f5b
Yohann Roussel [Mon, 13 Jun 2016 14:48:53 +0000 (14:48 +0000)]
Merge \\"Do not force turn off of Jack warning\\" am:
0a26fc0ace
am:
5185323de9
Change-Id: I054396d9bdb88822ca75be61a88e18f08213242d
Yohann Roussel [Mon, 13 Jun 2016 14:44:56 +0000 (14:44 +0000)]
Merge \"Do not force turn off of Jack warning\"
am:
0a26fc0ace
Change-Id: Iddfabd648876281596bc8c571968d18589f1f581
Yohann Roussel [Mon, 13 Jun 2016 14:33:47 +0000 (14:33 +0000)]
Merge "Do not force turn off of Jack warning"
Alex Klyubin [Sun, 12 Jun 2016 00:42:29 +0000 (17:42 -0700)]
Fix inefficiency in APK entry data alignment.
26f00cda4b979d7e74db6872990682335b36612b introduced a bug where an
APK entry's extra field is padded for alignment purposes when no
padding is necessary because the entry is aligned without any padding
bytes.
Bug:
27461702
Change-Id: Icb164dbaa26d9686412e2920318a9f40c5ce9751
Alex Deymo [Sat, 11 Jun 2016 01:19:34 +0000 (01:19 +0000)]
Merge \\\\"Redirect subprocess stderr to stdout in verbose mode.\\\\" am:
1318ec93e7 am:
74d7b31f7d am:
dbae67fac8
am:
361cc8c8e0
Change-Id: I51626e35079ca2ff8de45c488733e27ce367e944
Alex Deymo [Sat, 11 Jun 2016 01:15:42 +0000 (01:15 +0000)]
Merge \\\"Redirect subprocess stderr to stdout in verbose mode.\\\" am:
1318ec93e7 am:
74d7b31f7d
am:
dbae67fac8
Change-Id: I6a690861e22041a67bb5b17aff474ee8f0e8aa41
Alex Deymo [Sat, 11 Jun 2016 01:12:06 +0000 (01:12 +0000)]
Merge \\"Redirect subprocess stderr to stdout in verbose mode.\\" am:
1318ec93e7
am:
74d7b31f7d
Change-Id: Ia9757f09dead577349b0cf4b97cb062f30d0f45d
Alex Deymo [Sat, 11 Jun 2016 01:08:11 +0000 (01:08 +0000)]
Merge \"Redirect subprocess stderr to stdout in verbose mode.\"
am:
1318ec93e7
Change-Id: If411ad0cd8aba960e4ab8600a5dd1532e5bd9dca
Treehugger Robot [Sat, 11 Jun 2016 00:56:31 +0000 (00:56 +0000)]
Merge "Redirect subprocess stderr to stdout in verbose mode."
Alex Deymo [Fri, 10 Jun 2016 23:38:31 +0000 (16:38 -0700)]
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
David Turner [Fri, 10 Jun 2016 18:25:31 +0000 (18:25 +0000)]
Merge \\\\"goldfish_setup: grant /system/bin/sh exec access\\\\" am:
7a866d783c am:
0db549d72c am:
53896ca942
am:
7e98274608
Change-Id: Ib4e7427931f216221f046f2b42fe49f6e2f9df56
Nick Kralevich [Fri, 10 Jun 2016 18:22:04 +0000 (18:22 +0000)]
Merge \\\"goldfish_setup: grant /system/bin/sh exec access\\\" am:
7a866d783c am:
0db549d72c
am:
53896ca942
Change-Id: Ia0f2715a13126c1d93cbbe93b50179e231c39013
David Turner [Fri, 10 Jun 2016 18:18:37 +0000 (18:18 +0000)]
Merge \\"goldfish_setup: grant /system/bin/sh exec access\\" am:
7a866d783c
am:
0db549d72c
Change-Id: I861c80be973d94e666aa9c26c1519c93b220c094
Nick Kralevich [Fri, 10 Jun 2016 18:15:13 +0000 (18:15 +0000)]
Merge \"goldfish_setup: grant /system/bin/sh exec access\"
am:
7a866d783c
Change-Id: I340d78d01171de2eda4f25a2b4dbe0d637f35d59
David Turner [Fri, 10 Jun 2016 18:04:26 +0000 (18:04 +0000)]
Merge "goldfish_setup: grant /system/bin/sh exec access"
Tianjie Xu [Fri, 10 Jun 2016 17:42:58 +0000 (17:42 +0000)]
Add build.version.incremental to metadata am:
d06f07eef4 am:
21c8d29ee1
am:
8f08683e06
Change-Id: Ia648c307eb126f93b2ae3eeacc7bd1856169e142
Tianjie Xu [Fri, 10 Jun 2016 17:42:57 +0000 (17:42 +0000)]
Add build.version.incremental to metadata am:
d06f07eef4 am:
c201d28713
am:
884e274103
Change-Id: I12e13230498da7330bacb226c2cdae9dcc5c4263
Tianjie Xu [Fri, 10 Jun 2016 17:37:02 +0000 (17:37 +0000)]
Add build.version.incremental to metadata am:
d06f07eef4
am:
21c8d29ee1
Change-Id: I5da1e731e1d5694d8e9f3f2468ac8980ae8adfff
Tianjie Xu [Fri, 10 Jun 2016 17:30:30 +0000 (17:30 +0000)]
Add build.version.incremental to metadata am:
d06f07eef4
am:
c201d28713
Change-Id: Ib8a9dcc4441af7bed6374401deb0dc8c3aa92127
OSDN Git Service
