OSDN Git Service
Tao Bao [Thu, 16 Jun 2016 15:55:58 +0000 (15:55 +0000)]
Merge \\\"Support wiping userdata for A/B OTA packages.\\\" am:
b727d5bb32 am:
4f2b227fae
am:
7e5205f929
Change-Id: I1d921c74efdc697a2a58b0ac164ac44601e87257
Dan Willemsen [Thu, 16 Jun 2016 15:55:58 +0000 (15:55 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1 am:
3068a85962 am:
5da565a85a
am:
c4c3cc2ee9
Change-Id: I3f5443dbc7098f0cad17d16b4adc084064097bf1
Tao Bao [Thu, 16 Jun 2016 15:53:20 +0000 (15:53 +0000)]
Merge \\"Support wiping userdata for A/B OTA packages.\\" am:
b727d5bb32
am:
4f2b227fae
Change-Id: Icf157b44ecda14a2c289d4826e5a55af67e805d5
Dan Willemsen [Thu, 16 Jun 2016 15:53:20 +0000 (15:53 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1 am:
3068a85962
am:
5da565a85a
Change-Id: Ib0c7157644c1d51f37b8c91c76adb35c2df00de6
Tao Bao [Thu, 16 Jun 2016 15:50:47 +0000 (15:50 +0000)]
Merge \"Support wiping userdata for A/B OTA packages.\"
am:
b727d5bb32
Change-Id: I9d6e67c5e71b025f7cb9119b45f05c51f2cfd340
Dan Willemsen [Thu, 16 Jun 2016 15:50:46 +0000 (15:50 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1
am:
3068a85962
Change-Id: I20aec66ac749a5db3f65e368e14a5caca12afff8
Treehugger Robot [Thu, 16 Jun 2016 15:39:23 +0000 (15:39 +0000)]
Merge "Support wiping userdata for A/B OTA packages."
Dan Willemsen [Thu, 16 Jun 2016 15:38:02 +0000 (15:38 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1
* changes:
Check that NDK-built modules only link to NDK-built modules
Add macros for printing pretty warnings/errors in rules
Tao Bao [Wed, 15 Jun 2016 00:48:11 +0000 (17:48 -0700)]
Support wiping userdata for A/B OTA packages.
update_engine now accepts POWERWASH=1 to schedule a factory reset in
the post-install phase. Hook up with the --wipe_user_data flag in the
OTA script.
Bug:
28700985
Change-Id: Ie73876a61db90d124d2af588d674757376e9aabc
(cherry picked from commit
38ca0be399df26514f0412c7b7fca8050d36e9e2)
Tao Bao [Thu, 16 Jun 2016 03:49:34 +0000 (03:49 +0000)]
Support wiping userdata for A/B OTA packages.
am:
38ca0be399
Change-Id: Id1908bbbb475f5ae3bc16fc2da5120e7d205b0b6
Dan Willemsen [Tue, 7 Jun 2016 21:25:14 +0000 (14:25 -0700)]
Check that NDK-built modules only link to NDK-built modules
Modules built against the NDK should only link against modules also
built against the NDK (or link to the NDK prebuilts). This patch
attempts to catch these cases, and prints a large warning when this is
violated. Once the tree is cleaned up, this will change to an error.
Change-Id: Ib6ffcc38d9161abdbe45a58af26ba429fb6f1876
Dan Willemsen [Thu, 16 Jun 2016 02:20:57 +0000 (19:20 -0700)]
Add macros for printing pretty warnings/errors in rules
Change-Id: Ia58e6bc1328c84e5f4ba1f6a2fd2d650e94e127e
Tao Bao [Wed, 15 Jun 2016 00:48:11 +0000 (17:48 -0700)]
Support wiping userdata for A/B OTA packages.
update_engine now accepts POWERWASH=1 to schedule a factory reset in
the post-install phase. Hook up with the --wipe_user_data flag in the
OTA script.
Bug:
28700985
Change-Id: Ie73876a61db90d124d2af588d674757376e9aabc
Dan Willemsen [Wed, 15 Jun 2016 23:06:33 +0000 (23:06 +0000)]
Merge \\\"Fix kati --no_ignore_dirty usage\\\" am:
a6f510c776 am:
cf771ed98f
am:
018d5d174a
Change-Id: I7349587756c88d6fafc18ef3b4d54bc9a30ca8e8
Dan Willemsen [Wed, 15 Jun 2016 23:06:32 +0000 (23:06 +0000)]
Merge \\\"Forbid libstdc++ on Linux and Darwin\\\" am:
7fba3347b9 am:
3cd95c708d
am:
bf4617c424
Change-Id: Ic959c7854c42eea8bbe026e360e050cffd896ade
Dan Willemsen [Wed, 15 Jun 2016 22:57:48 +0000 (22:57 +0000)]
Merge \\"Fix kati --no_ignore_dirty usage\\" am:
a6f510c776
am:
cf771ed98f
Change-Id: I8d199811ed752acbf464016cdf23f5ca9d818a6d
Dan Willemsen [Wed, 15 Jun 2016 22:57:47 +0000 (22:57 +0000)]
Merge \\"Forbid libstdc++ on Linux and Darwin\\" am:
7fba3347b9
am:
3cd95c708d
Change-Id: I78315783b64ce9a1a796795af6f7818604367cf9
Dan Willemsen [Wed, 15 Jun 2016 22:55:02 +0000 (22:55 +0000)]
Merge \"Fix kati --no_ignore_dirty usage\"
am:
a6f510c776
Change-Id: I3b33f8a4762c7f8867afb5812933c452cdfa16b2
Dan Willemsen [Wed, 15 Jun 2016 22:54:59 +0000 (22:54 +0000)]
Merge \"Forbid libstdc++ on Linux and Darwin\"
am:
7fba3347b9
Change-Id: I896febb45ca1245fa56dff113463606ac88b7c01
Treehugger Robot [Wed, 15 Jun 2016 22:41:32 +0000 (22:41 +0000)]
Merge "Fix kati --no_ignore_dirty usage"
Dan Willemsen [Wed, 15 Jun 2016 22:38:30 +0000 (22:38 +0000)]
Merge "Forbid libstdc++ on Linux and Darwin"
Dan Willemsen [Wed, 15 Jun 2016 21:55:58 +0000 (14:55 -0700)]
Fix kati --no_ignore_dirty usage
Kati only supports a single use of --no_ignore_dirty, so we were
ignoring the SOONG_ANDROID_MK file, and only detecting changes to
SOONG_MAKEVARS_MK. Fix this by using a pattern that should apply to both
of those makefiles.
Change-Id: I46390f9887f95f1db0efe4e93339667f35ebc67c
Alex Klyubin [Wed, 15 Jun 2016 20:52:57 +0000 (20:52 +0000)]
Merge \\\"Don\\\'t depend on Bouncy Castle.\\\" am:
1fb96c3ff5 am:
3b36c7960d
am:
37a8cc5f51
Change-Id: I9dda235b0c6b9de7183a07c9b932f5a6a573281f
Alex Klyubin [Wed, 15 Jun 2016 20:48:11 +0000 (20:48 +0000)]
Merge \\"Don\\'t depend on Bouncy Castle.\\" am:
1fb96c3ff5
am:
3b36c7960d
Change-Id: Ib33cb3a8aaa94df96731a16f20a7ef5415f42a3f
Alex Klyubin [Wed, 15 Jun 2016 20:43:46 +0000 (20:43 +0000)]
Merge \"Don\'t depend on Bouncy Castle.\"
am:
1fb96c3ff5
Change-Id: I04401121eb3ad2e026268f37ffe9d19d95478325
Dan Willemsen [Wed, 15 Jun 2016 20:41:45 +0000 (13:41 -0700)]
Forbid libstdc++ on Linux and Darwin
The last user has been removed, forbid any modules from selecting this.
Change-Id: Idd9ef6ca4b6c6754935d59c4a09c7d213ae481c1
Alex Klyubin [Wed, 15 Jun 2016 20:32:34 +0000 (20:32 +0000)]
Merge "Don't depend on Bouncy Castle."
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 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: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: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"
Alex Klyubin [Tue, 14 Jun 2016 17:26:41 +0000 (10:26 -0700)]
Don't depend on Bouncy Castle.
This switches PKCS#7 SignedData generation code from Bouncy Castle to
OpenJDK's proprietary internal API. This is to avoid depending on a
huge library that's not really needed. In the longer term, it's best
to add our own implementation of PKCS#7 SignedData building, parsing,
and verification. This will give the code more power to mimic what the
Android platform does.
Bug:
27461702
Change-Id: I29f1ceea1293e35424fde69c0f2969d551345100
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."
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: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: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: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: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: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: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: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."
OSDN Git Service
