Commit Graph

34000 Commits

Author SHA1 Message Date
Tao Bao
44150fa69d Merge "Build recovery-two-step.img for two-step OTAs." am: 06e14e438f am: d07f9995b8 am: c180a06b20
am: 8d290959b5

Change-Id: Ic8bd67da5d018130a730037cdf5f97175d60a7f1
2016-12-02 15:41:02 +00:00
Tao Bao
8d290959b5 Merge "Build recovery-two-step.img for two-step OTAs." am: 06e14e438f am: d07f9995b8
am: c180a06b20

Change-Id: Ib37a9c0fe80b6446f441c08ccc40eb85d9cf9e17
2016-12-02 15:33:31 +00:00
Tao Bao
c180a06b20 Merge "Build recovery-two-step.img for two-step OTAs." am: 06e14e438f
am: d07f9995b8

Change-Id: I256b7c146db3bfc0df4909f643edee1a7c8dd61b
2016-12-02 15:26:29 +00:00
Tao Bao
d07f9995b8 Merge "Build recovery-two-step.img for two-step OTAs."
am: 06e14e438f

Change-Id: I9c5d6e5f71da88bc0f662373335b024a55ca193e
2016-12-02 15:19:00 +00:00
Tao Bao
06e14e438f Merge "Build recovery-two-step.img for two-step OTAs." 2016-12-02 15:09:13 +00:00
Yohann Roussel
a6c122b534 Set platform min sdk for Jack to o-b1
Test: m core-all
(cherry picked from commit 94acfe908b3e70cdd11920c92715ef06de7ed212)

Change-Id: I26a558677f2fa8ede09ad1ae7f31b786c4ba0a43
2016-12-02 11:10:42 +01:00
Yohann Roussel
5360e0160b Set platform min sdk for Jack to o-b1
Test: m core-all
(cherry picked from commit 94acfe908b3e70cdd11920c92715ef06de7ed212)

Change-Id: I26a558677f2fa8ede09ad1ae7f31b786c4ba0a43
2016-12-02 08:36:24 +00:00
Tao Bao
47ec5ab561 Build recovery-two-step.img for two-step OTAs.
In two-step OTAs, we write recovery image to /boot as the first step so
that we can reboot from there and install a new recovery image to
/recovery. However, bootloader will show "Your device is corrupt"
message when booting /boot with the recovery image. Because the recovery
image encodes the path of "/recovery" as part of the signature metadata,
which fails the verified boot.

This CL generates a special "recovery-two-step.img" in addition to the
regular recovery.img. This image encodes "/boot" when being signed,
which will be flashed to /boot at stage 1/3 in a two-step OTA.

Here are the desired changes:

- 'IMAGES/recovery-two-step.img' exists in target_files.zip for non-A/B
targets (e.g. bullhead). The image should not exist for targets that
don't have a recovery partition (e.g. A/B devices like sailfish).

- <device>-img.zip should not contain 'recovery-two-step.img'.

- Nothing should change when building non-two-step OTAs. For two-step
OTAs, 'recovery-two-step.img' should be included in the OTA package;
'updater-script' should flash this image to /boot at stage 1/3.

- When building a two-step OTA with an input TF.zip that doesn't have
  IMAGES/recovery-two-step.img, it should use the existing
  IMAGES/recovery.img instead.

Bug: 32986477
Test: Tested the steps above on bullhead and sailfish.
Change-Id: I34e6c599bcf2011d4cd5c926999418b3975d6d0f
(cherry picked from commit d42e97ebb4)
2016-12-01 17:55:44 -08:00
Tao Bao
d42e97ebb4 Build recovery-two-step.img for two-step OTAs.
In two-step OTAs, we write recovery image to /boot as the first step so
that we can reboot from there and install a new recovery image to
/recovery. However, bootloader will show "Your device is corrupt"
message when booting /boot with the recovery image. Because the recovery
image encodes the path of "/recovery" as part of the signature metadata,
which fails the verified boot.

This CL generates a special "recovery-two-step.img" in addition to the
regular recovery.img. This image encodes "/boot" when being signed,
which will be flashed to /boot at stage 1/3 in a two-step OTA.

Here are the desired changes:

- 'IMAGES/recovery-two-step.img' exists in target_files.zip for non-A/B
targets (e.g. bullhead). The image should not exist for targets that
don't have a recovery partition (e.g. A/B devices like sailfish).

- <device>-img.zip should not contain 'recovery-two-step.img'.

- Nothing should change when building non-two-step OTAs. For two-step
OTAs, 'recovery-two-step.img' should be included in the OTA package;
'updater-script' should flash this image to /boot at stage 1/3.

- When building a two-step OTA with an input TF.zip that doesn't have
  IMAGES/recovery-two-step.img, it should use the existing
  IMAGES/recovery.img instead.

Bug: 32986477
Test: Tested the steps above on bullhead and sailfish.
Change-Id: I34e6c599bcf2011d4cd5c926999418b3975d6d0f
2016-12-01 17:47:59 -08:00
Pirama Arumuga Nainar
c83b37c772 Merge "Do not *directly* package libbcc.so" am: ec0d7cbc49 am: 0cc559f7d8 am: 564a624870
am: bf762321f5

Change-Id: I93ceec4a52dfd5c426f2d37ba49a12b4bfb4b789
2016-12-01 18:28:15 +00:00
Pirama Arumuga Nainar
bf762321f5 Merge "Do not *directly* package libbcc.so" am: ec0d7cbc49 am: 0cc559f7d8
am: 564a624870

Change-Id: Ia5c36206d3dac074580cda1d3da70d7f0df87953
2016-12-01 18:21:45 +00:00
Pirama Arumuga Nainar
564a624870 Merge "Do not *directly* package libbcc.so" am: ec0d7cbc49
am: 0cc559f7d8

Change-Id: Ida5a4c8d5643bbe1bdd3d1b2f106ce06ba95b334
2016-12-01 18:16:13 +00:00
Pirama Arumuga Nainar
0cc559f7d8 Merge "Do not *directly* package libbcc.so"
am: ec0d7cbc49

Change-Id: I15871b1ca4cb5fa5488721a5f6a21bfa2a72feab
2016-12-01 18:11:13 +00:00
Pirama Arumuga Nainar
ec0d7cbc49 Merge "Do not *directly* package libbcc.so" 2016-12-01 17:58:47 +00:00
Tao Bao
aeb0ee4d6d Merge "releasetools: Remove dead parameter in GetBootableImage()." am: 8df4fea85f am: 2e3f1c5258 am: dfff1ac065
am: 59da2ee4aa

Change-Id: I9f150af5698c6dcab7d7f059f009f0fca15455c0
2016-12-01 17:25:39 +00:00
Ray Essick
b8c5eb7402 add mediaanalytics service to build
Builds the new mediaanalytics service as part of basic
build (as opposed to product-specific builds).

Bug: 30267133
Test: clean build of system, see that new service is present
Change-Id: Ibf44d97974b200d93dcf4d0605e20655eda5b95e
2016-12-01 09:24:43 -08:00
Tao Bao
59da2ee4aa Merge "releasetools: Remove dead parameter in GetBootableImage()." am: 8df4fea85f am: 2e3f1c5258
am: dfff1ac065

Change-Id: I64b0f247c84b53c53f6ad04551264e4fa352f1eb
2016-12-01 17:19:08 +00:00
Tao Bao
dfff1ac065 Merge "releasetools: Remove dead parameter in GetBootableImage()." am: 8df4fea85f
am: 2e3f1c5258

Change-Id: I49a84adeac56d399749920272f07d3eacc436be4
2016-12-01 17:13:37 +00:00
Tao Bao
2e3f1c5258 Merge "releasetools: Remove dead parameter in GetBootableImage()."
am: 8df4fea85f

Change-Id: I192af3927849d0d8f995f0002b8b8f2e191b794f
2016-12-01 17:09:07 +00:00
Tao Bao
8df4fea85f Merge "releasetools: Remove dead parameter in GetBootableImage()." 2016-12-01 17:02:07 +00:00
Paul Duffin
c039e0216f Merge "Replace core-junit with legacy-test" am: 32cc1f80e5 am: 74f8ee05de am: 29a72d0e22
am: ba57775354

Change-Id: If81ba7729c288b94a6fdaf7de9debba76b248ca6
2016-12-01 11:00:47 +00:00
Paul Duffin
ba57775354 Merge "Replace core-junit with legacy-test" am: 32cc1f80e5 am: 74f8ee05de
am: 29a72d0e22

Change-Id: Ib3458dfd6bf5bfd646cb24c607ec436f897531df
2016-12-01 10:54:46 +00:00
Paul Duffin
29a72d0e22 Merge "Replace core-junit with legacy-test" am: 32cc1f80e5
am: 74f8ee05de

Change-Id: Id32488dfe7498c7b00ba05c2fa88de6465b362ee
2016-12-01 10:48:46 +00:00
Paul Duffin
74f8ee05de Merge "Replace core-junit with legacy-test"
am: 32cc1f80e5

Change-Id: Id425eff2aaafdf8ad63bc66ef2d28f71d32d6e8b
2016-12-01 10:42:16 +00:00
Paul Duffin
32cc1f80e5 Merge "Replace core-junit with legacy-test" 2016-12-01 10:34:07 +00:00
Tao Bao
2a4336bc04 releasetools: Remove dead parameter in GetBootableImage().
The 'system_img_path' parameter was introduced in commit
d995f4b04d, but became obsolete since
commit 2ce63edab7.

Test: m dist
Change-Id: Iffd496d929db5cc3dfc955a48bfc1b1317bd012f
2016-12-01 00:08:27 -08:00
Andreas Gampe
fd690886fd Merge changes from topic 'simplify_app_process_asan_modules' am: 9a3bd76ab4 am: d3708a5aeb am: d5bda5330d
am: 06eea4933c

Change-Id: I551fad3cd104003da93336c65b38789c5ae2eee9
2016-12-01 03:13:43 +00:00
Andreas Gampe
bddf67fa4d Revert "Build: Add sanitized app_process" am: 88d43677f5 am: d77b29fdb3 am: 1b7e73ad55
am: 7c974b2c8f

Change-Id: I67babd7b4249934c6891727f025e87f963efaca9
2016-12-01 03:13:35 +00:00
Andreas Gampe
d24fb170a1 Revert "Build: Add asanwrapper in SANITIZE_LITE" am: 4938f3300a am: 92058120b2 am: 75aa99ba60
am: f1ebff97a2

Change-Id: I7f08bb5a5d56836042fac54d810a3bad1b760cec
2016-12-01 03:13:28 +00:00
Andreas Gampe
06eea4933c Merge changes from topic 'simplify_app_process_asan_modules' am: 9a3bd76ab4 am: d3708a5aeb
am: d5bda5330d

Change-Id: I9f17d113262a1625cafe2bf5c4caa2bdf1040632
2016-12-01 03:09:08 +00:00
Andreas Gampe
7c974b2c8f Revert "Build: Add sanitized app_process" am: 88d43677f5 am: d77b29fdb3
am: 1b7e73ad55

Change-Id: Iacb14d7e7e3ec2d836fe260594018def6bf46c9c
2016-12-01 03:09:03 +00:00
Andreas Gampe
f1ebff97a2 Revert "Build: Add asanwrapper in SANITIZE_LITE" am: 4938f3300a am: 92058120b2
am: 75aa99ba60

Change-Id: I64c2016ed8d14cb264f4c0619e0b2842923a9ee3
2016-12-01 03:08:57 +00:00
Andreas Gampe
d5bda5330d Merge changes from topic 'simplify_app_process_asan_modules' am: 9a3bd76ab4
am: d3708a5aeb

Change-Id: Ieda8df429285548676089a7653e97ea36b542526
2016-12-01 02:58:05 +00:00
Andreas Gampe
1b7e73ad55 Revert "Build: Add sanitized app_process" am: 88d43677f5
am: d77b29fdb3

Change-Id: Ie46ff2d5b15970ee188ad8e0ac64278a0ce4e4cf
2016-12-01 02:57:59 +00:00
Andreas Gampe
75aa99ba60 Revert "Build: Add asanwrapper in SANITIZE_LITE" am: 4938f3300a
am: 92058120b2

Change-Id: I818d10ecaee2be176abecbb70d3d0997ea86d6bc
2016-12-01 02:57:54 +00:00
Andreas Gampe
d3708a5aeb Merge changes from topic 'simplify_app_process_asan_modules'
am: 9a3bd76ab4

Change-Id: I07d79da80ce2fce035c87e768d12c1b136bf6fdd
2016-12-01 02:48:21 +00:00
Andreas Gampe
d77b29fdb3 Revert "Build: Add sanitized app_process"
am: 88d43677f5

Change-Id: I358a67f5e89bf72e7bba9d97a16d34d9a3e79afb
2016-12-01 02:47:34 +00:00
Andreas Gampe
92058120b2 Revert "Build: Add asanwrapper in SANITIZE_LITE"
am: 4938f3300a

Change-Id: Ic3745664db0b89baaea8b98b79ead63a77e95440
2016-12-01 02:47:29 +00:00
Treehugger Robot
9a3bd76ab4 Merge changes from topic 'simplify_app_process_asan_modules'
* changes:
  Revert "Build: Add sanitized app_process"
  Revert "Build: Add asanwrapper in SANITIZE_LITE"
2016-12-01 02:38:29 +00:00
Andreas Gampe
88d43677f5 Revert "Build: Add sanitized app_process"
This reverts commit a35d92e431.

The app_process__asan module is merged into app_process.

Bug: 33224213
Test: m
Change-Id: I5e3e836c67b5bd17cf967f1b2429e39c4e18557b
2016-11-30 16:40:13 -08:00
Andreas Gampe
4938f3300a Revert "Build: Add asanwrapper in SANITIZE_LITE"
This reverts commit eee31511f7.

Rewriting of app_process adds an automatic dependency.

Bug: 33224213
Test: m
Change-Id: Idd9509d116692954224f4d2ffd6c81b69e9a85a3
2016-11-30 16:39:40 -08:00
Andreas Gampe
62f5a069d0 Merge changes from topic 'app_process_sanitized_binaries' am: de24e6198e am: 88757661d5 am: 6dc32b2e7a
am: 9f7b892d69

Change-Id: I02e5b56d7ca1a06ceee65e8cc80e4c4a66ff3dc2
2016-12-01 00:33:40 +00:00
Andreas Gampe
98bfec1187 Build: Add asanwrapper in SANITIZE_LITE am: eee31511f7 am: 3c326183ca am: 18c9a0d841
am: bae6a8bc63

Change-Id: I3023fe54c86b13d12609f2517aa2abd214a614e3
2016-12-01 00:33:34 +00:00
Andreas Gampe
d425b3ae29 Build: Add sanitized app_process am: a35d92e431 am: 2ceff14391 am: 77541fee1b
am: 95532682c5

Change-Id: I3e641ab40b394522abd50c50c612861ed6384eff
2016-12-01 00:33:28 +00:00
Andreas Gampe
9f7b892d69 Merge changes from topic 'app_process_sanitized_binaries' am: de24e6198e am: 88757661d5
am: 6dc32b2e7a

Change-Id: I79111e0d5d3cde7de02098eae351b6ca3f044b79
2016-12-01 00:27:30 +00:00
Andreas Gampe
bae6a8bc63 Build: Add asanwrapper in SANITIZE_LITE am: eee31511f7 am: 3c326183ca
am: 18c9a0d841

Change-Id: I76fb780a0505166d004f1293127907d8f9ac9755
2016-12-01 00:27:24 +00:00
Andreas Gampe
95532682c5 Build: Add sanitized app_process am: a35d92e431 am: 2ceff14391
am: 77541fee1b

Change-Id: I26c9aa1babb03d328d80d64ee5f5dd427cef26e6
2016-12-01 00:27:17 +00:00
Andreas Gampe
6dc32b2e7a Merge changes from topic 'app_process_sanitized_binaries' am: de24e6198e
am: 88757661d5

Change-Id: I9567415f53bb86e6d2caebe51060c66e9400cead
2016-12-01 00:17:02 +00:00
Andreas Gampe
18c9a0d841 Build: Add asanwrapper in SANITIZE_LITE am: eee31511f7
am: 3c326183ca

Change-Id: I14fe1837e7cc66e9c6f124353c860959b230b779
2016-12-01 00:16:55 +00:00
Andreas Gampe
77541fee1b Build: Add sanitized app_process am: a35d92e431
am: 2ceff14391

Change-Id: I55ecc896ca76a74baad033dd9b48462fc00c3235
2016-12-01 00:16:49 +00:00