Commit graph

55628 commits

Author SHA1 Message Date
Tao Bao
003ae1cde8 Merge "Remove the workaround that forces rebuilding recovery patch."
am: 3d33aa7c2c

Change-Id: I73cf84bf0e85aa61f9a238210c843859a77deb1e
2019-10-09 11:55:07 -07:00
Tao Bao
3d33aa7c2c Merge "Remove the workaround that forces rebuilding recovery patch." 2019-10-09 18:22:26 +00:00
Tao Bao
cbd6d498d2 Remove the workaround that forces rebuilding recovery patch.
The issue has been addressed on releasetools script side, by specifying
UUID and AVB salt to get reproducible images [1].

[1] https://android-review.googlesource.com/c/platform/build/+/1135332

Fixes: 134525174
Test: `m dist` with a non-A/B target.
      `validate_target_files out/dist/target_files.zip` passes.
Change-Id: Ida6750291706036c9b0c192d8abcde6d65155287
2019-10-08 22:23:37 +00:00
Tao Bao
e1829be1d7 Merge "releasetools: Fix the support for getting reproducible images."
am: 17f505e7ea

Change-Id: Id30b4f8a4ec34585eb6055531f94d9e1cd26c83d
2019-10-08 13:14:47 -07:00
Tao Bao
17f505e7ea Merge "releasetools: Fix the support for getting reproducible images." 2019-10-08 19:53:55 +00:00
David Anderson
0c61e14227 Merge "Add IBootControl HAL 1.1."
am: a8b633d181

Change-Id: Ia78800744ef04a877b062631cc3444f29d9a35bd
2019-10-08 12:28:49 -07:00
David Anderson
a8b633d181 Merge "Add IBootControl HAL 1.1." 2019-10-08 19:03:05 +00:00
Tao Bao
0b55fc40cb Merge "releasetools: Move BuildInfo into common."
am: 163df7d40b

Change-Id: Ide728c5134a14f9b564c5d2dccb9de031ccfe12a
2019-10-08 11:14:16 -07:00
Tao Bao
163df7d40b Merge "releasetools: Move BuildInfo into common." 2019-10-08 17:44:15 +00:00
Tao Bao
7600946b17 Merge "releasetools: Move MockScriptWriter into test_utils."
am: dc66f02c54

Change-Id: I273b433bfb43f80ed379cb64c6f7771dfca453d2
2019-10-08 07:27:41 -07:00
Tao Bao
dc66f02c54 Merge "releasetools: Move MockScriptWriter into test_utils." 2019-10-08 14:13:47 +00:00
Guillaume Chelfi
49e3172779 Merge "Fix zsh compatibility issue in build/envsetup.sh"
am: 3da3191366

Change-Id: Ib7a59be4f53c21447835e13df166fea825b6dc99
2019-10-08 05:13:54 -07:00
Treehugger Robot
3da3191366 Merge "Fix zsh compatibility issue in build/envsetup.sh" 2019-10-08 11:41:26 +00:00
Tao Bao
3ed35d3d25 releasetools: Fix the support for getting reproducible images.
We used to support getting idempotent images when given the same inputs,
by specifying UUID and AVB salt to the image builders. The support was
broken by Q changes that moved away from build-time fingerprints [1].

This CL addresses the issue by updating the logic in computing UUID and
AVB salt to be based on BuildInfo.fingerprint, as opposed to the
deprecated static build fingerprint.

[1] https://android-review.googlesource.com/c/platform/build/+/892933

Bug: 134525174
Test: TreeHugger
Test: lunch a target; `atest --host releasetools_test releasetools_py3_test`
Test: `m dist`; `unzip out/dist/target_files.zip IMAGES/\*`;
      `zip -d out/dist/target_files.zip IMAGES/\*`
Test: `add_img_to_target_files -a out/dist/target_files.zip`. Verify that
      the rebuilt images are identical to the ones deleted.
Change-Id: I8844fc7f044e9abfcd96a00e8958fa0583c70eaf
2019-10-07 23:32:07 -07:00
Tao Bao
1c320f8573 releasetools: Move BuildInfo into common.
There is no change to module functionalities. Testcases are moved around
accordingly.

Bug: 134525174
Test: TreeHugger
Test: lunch a target; atest --host releasetools_test releasetools_py3_test
Change-Id: I7bc8f49cc239e7c6655fe5e375508f01c1743b94
2019-10-07 20:13:59 -07:00
Tao Bao
e114804150 releasetools: Move MockScriptWriter into test_utils.
Bug: 134525174
Test: TreeHugger
Test: lunch a target; atest --host releasetools_test releasetools_py3_test
Change-Id: I6d30f4d153d59d65227275e1d3285e30dfafd90e
2019-10-07 20:00:34 -07:00
Tao Bao
b945f9692e Merge "releasetools: Update OWNERS."
am: 7e49064030

Change-Id: I97ac2f91f85c6ffb9cc30e4b982e0e53d5b2b740
2019-10-07 19:20:13 -07:00
Tao Bao
7e49064030 Merge "releasetools: Update OWNERS." 2019-10-08 02:12:22 +00:00
Jooyung Han
6ba261edf0 Merge "Check if installable before installing unstripped"
am: 4dc0c25643

Change-Id: I74287511c49395e94a57e18539e13c8eafdfdf94
2019-10-07 17:14:36 -07:00
David Anderson
b9e8d8cac8 Add IBootControl HAL 1.1.
Bug: 138861550
Test: m check-vndk-list
Test: m
Change-Id: If09d031e5acf1178fce942526782a41426c5180b
Merged-In: If09d031e5acf1178fce942526782a41426c5180b
2019-10-07 17:13:11 -07:00
Treehugger Robot
4dc0c25643 Merge "Check if installable before installing unstripped" 2019-10-07 23:56:05 +00:00
Tao Bao
802fd89263 Merge "releasetools: Update the handling of recovery fstab."
am: 7b1c49a70d

Change-Id: I6070ffefaa7360f5f9c7527af95265de4c881bf2
2019-10-07 12:54:57 -07:00
Tao Bao
60f5d67677 releasetools: Update OWNERS.
Test: N/A
Change-Id: Ie476ff08a360f15f769e54dca7428a2d055f1a37
2019-10-07 12:39:55 -07:00
Tao Bao
7b1c49a70d Merge "releasetools: Update the handling of recovery fstab." 2019-10-07 19:33:21 +00:00
Tao Bao
34bd354511 Merge "Enforce the consistency between AB_OTA_UPDATER and AB_OTA_PARTITIONS."
am: e3c95f71e7

Change-Id: Id19d9ed15cea91022d2693ab8ffa01a989b1ffaa
2019-10-07 12:28:52 -07:00
Tao Bao
fa4ea59837 Merge "releasetools: Fix releasetools_py3_test."
am: ae3a9a138d

Change-Id: I83842f29a86402497858d73d1b44a61f1c98040b
2019-10-07 12:25:42 -07:00
Tao Bao
e3c95f71e7 Merge "Enforce the consistency between AB_OTA_UPDATER and AB_OTA_PARTITIONS." 2019-10-07 19:06:46 +00:00
Tao Bao
ae3a9a138d Merge "releasetools: Fix releasetools_py3_test." 2019-10-07 19:06:07 +00:00
Tao Bao
e3fdc126c4 Merge "releasetools: Update tests to match SparseImage change."
am: d253f8a614

Change-Id: I90538d2342ed609328320a261c0d03dd4270a3db
2019-10-07 12:06:02 -07:00
Tao Bao
d253f8a614 Merge "releasetools: Update tests to match SparseImage change." 2019-10-07 18:52:04 +00:00
Nikita Ioffe
e542a799c8 Merge "Unconditionally install shim apex on system partition"
am: 42b2b54c2b

Change-Id: I303417bee4f5143abfda29eadfb997203c0cb168
2019-10-07 08:36:15 -07:00
Nikita Ioffe
42b2b54c2b Merge "Unconditionally install shim apex on system partition" 2019-10-07 15:10:10 +00:00
Jooyung Han
66bd7385d2 Check if installable before installing unstripped
When LOCAL_UNINSTALLABLE_MODULE is true, the module is not installed.
But its unstripped output is installed to the path based on
my_module_path which is not set for it is not installable. Moreover,
my_module_path is not reset after use.

As a result, when LOCAL_UNINSTALLABLE_MODULE is true, the path for
unstripped output is unexpected.

The installation is guarded by LOCAL_UNINSTALLABLE_MODULE now,
which was LOCAL_VNDK_DEPEND_ON_CORE_VARIANT.

Test: m
Change-Id: If18cf76118e058a9e0701a8d66f7ff0f534e5881
2019-10-07 22:33:47 +09:00
Nikita Ioffe
b6eeae7289 Unconditionally install shim apex on system partition
Trying to do it on per-device basis is prone to errors and already
bitten us several times. For example, currently aosp_taimen doesn't
install shim apex on system partition, but specifies
ro.apex.updatable = "true", which means that it doesn't pass CTS tests.

Unconditionally installing shim APEX shouldn't introduce any problems
since apexd will skip its activation of devices that don't support
updatable APEX.

Test: m checkbuild
Bug: 140957666
Change-Id: I6b5e668b40b97752295c831684a7291842533c40
2019-10-07 12:14:08 +01:00
Yo Chiang
c4ca72d8e9 Merge "Clean up mainline whitelist in aosp_product.mk"
am: 8ca4bf76d6

Change-Id: I7bcd80d30c3edea5ebfae340bf2869e7b798f445
2019-10-07 03:36:45 -07:00
Roland Levillain
0a24633ef5 Merge "Introduce build variable OVERRIDE_TARGET_FLATTEN_APEX."
am: 81681abfef

Change-Id: I1dea79a8ff7ee4f1e12cd731e87b124dca324ecc
2019-10-07 03:35:27 -07:00
Yo Chiang
2214b0fb08 Merge "Add x86 / x86_arm mainline_system product"
am: 16652990ec

Change-Id: Ibb05a35c9da7176d08ddee433d0f26cfd1952f8b
2019-10-07 03:34:44 -07:00
SzuWei Lin
b1ed0bd95b Merge "Remove healthd from base_product.mk"
am: 7c7f144484

Change-Id: Ic1afd4de3df00df5d6779a1dbeb90fef40f8cf19
2019-10-07 03:29:20 -07:00
Yo Chiang
8ca4bf76d6 Merge "Clean up mainline whitelist in aosp_product.mk" 2019-10-07 10:28:46 +00:00
Roland Levillain
81681abfef Merge "Introduce build variable OVERRIDE_TARGET_FLATTEN_APEX." 2019-10-07 10:27:41 +00:00
Treehugger Robot
16652990ec Merge "Add x86 / x86_arm mainline_system product" 2019-10-07 10:27:14 +00:00
Treehugger Robot
7c7f144484 Merge "Remove healthd from base_product.mk" 2019-10-07 10:10:34 +00:00
Tao Bao
615b65d097 releasetools: Fix releasetools_py3_test.
Test: Use a lunch'd target;
      `atest --host releasetools_test releasetools_py3_test`
Change-Id: Ibcced83a7989ef8fc15464728ab1d5fa71ca988e
2019-10-06 23:29:34 -07:00
Tao Bao
a264feffe8 releasetools: Update tests to match SparseImage change.
The previous change in commit 22632cc82c
changed the behavior in loading file map. It now always puts a copy of
the input text in `extra` field. Update the tests accordingly.

Bug: 79951650
Test: Use a lunch'd target; `atest --host releasetools_test`
Change-Id: Iccf06c817c1305bf9946d7759c6f6f6af21fe85e
2019-10-06 22:21:14 -07:00
Tao Bao
bb20e1554b Merge "releasetools: Support verifying files with non-monotonic ranges."
am: 99d855db8f

Change-Id: I5f88c53f45a476eef1da8645735d188210f36c64
2019-10-06 21:11:59 -07:00
Tao Bao
99d855db8f Merge "releasetools: Support verifying files with non-monotonic ranges." 2019-10-07 01:33:30 +00:00
Yo Chiang
e9b513a35a Clean up mainline whitelist in aosp_product.mk
Bug: 138281437
Bug: 140912362
Test: for prod in aosp_bonito aosp_arm64 aosp_cf_x86_phone ; do \
        lunch ${prod}-userdebug \
        m -j100 nothing || exit 1 \
      done

Change-Id: I2bc1f49ce68e49313e5c00104aad7b21a101ca7a
2019-10-05 09:06:36 +00:00
SzuWei Lin
24e6bcd0b6 Remove healthd from base_product.mk
healthd had been deprecated from Android P.
Does not need to support it now.

Bug: 142164625
Bug: 138284857
Test: lunch gsi_arm64-userdebug;make -j
Test: No healthd in out folder
Change-Id: I48db70f4bf39f6322bd2e80e536e2ec96b3a6408
2019-10-05 14:05:48 +08:00
Tao Bao
765668fff7 releasetools: Update the handling of recovery fstab.
First, remove the use of info_dict['fstab'] in add_img_to_target_files.
 - info_dict['fstab'] corresponds to recovery fstab
   (`/etc/recovery.fstab`), which may differ from the one used for
   normal boot.
 - When calling build_image.ImagePropFromGlobalDict, we already have the
   desired info from global dict (`META/info_dict.txt`).

Second, common.LoadInfoDict now loads recovery fstab only for non-A/B
devices. Because the info is only meaningful for installing non-A/B OTAs
(under recovery mode).

Fixes: 132458722
Test: TreeHugger
Test: Build non-A/B incremental OTAs.
Change-Id: Id23e7b17264c123319fe00b1663d52bfd9b4a5e2
2019-10-04 22:39:32 -07:00
Yo Chiang
db7529d009 Merge "Re-submit "Make mainline device use apex""
am: 491966fb7f

Change-Id: I32e950b118863ddfcfcb621cff664eb860345dc1
2019-10-04 20:44:15 -07:00