Commit Graph

56105 Commits

Author SHA1 Message Date
Tao Bao
fca8bea051 Merge "releasetools: Fix the support for getting reproducible images." am: 17f505e7ea
am: e1829be1d7

Change-Id: I87452f0bdf542041fb4ed4535e0947316269d893
2019-10-08 13:20:21 -07: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
c24146981a Merge "Add IBootControl HAL 1.1." am: a8b633d181
am: 0c61e14227

Change-Id: I62d2a316ce3586e856c0b42ac9534596436643f3
2019-10-08 12:35:17 -07: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
dee7882f1e Merge "releasetools: Move BuildInfo into common." am: 163df7d40b
am: 0b55fc40cb

Change-Id: Ib2f46805b87faf728df8a7242c15d8308c6b27de
2019-10-08 11:20:16 -07: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
Lev Proleev
bace8c091c Add NeuralNetworks HAL v1.3
Bug: 139120468
Test: m check-vndk-list
Test: m
Change-Id: Id1baae2c00a38e5327ab144db76189f53bcb04cf
Merged-In: Id1baae2c00a38e5327ab144db76189f53bcb04cf
(cherry picked from commit fde53f4e3e)
2019-10-08 16:57:59 +01:00
Tao Bao
efab03c238 Merge "releasetools: Move MockScriptWriter into test_utils." am: dc66f02c54
am: 7600946b17

Change-Id: I46fba3b4c06505fb6d0219eced487abd64228672
2019-10-08 07:33:33 -07: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
24a09dc074 Merge "Fix zsh compatibility issue in build/envsetup.sh" am: 3da3191366
am: 49e3172779

Change-Id: I401bcaa42b97f800ba8c94ec5989ab88df074d0a
2019-10-08 05:19:15 -07: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
Bowgo Tsai
5c40c7166f Adding boot-test-harness.img
In commit I30137c3caef91805d9143d404e5e4d06c0fccc30, we added
a boot-debug.img to allow adb root when using an user build GSI image.

However, to run automated tests, it requires additional properties,
which are not needed for GSI compliance:
    ro.audio.silent=1
    ro.test_harness=1

This CL adds an additional boot-test-harness.img for automated tests,
and keeps the original boot-debug.img for GSI compliance.

Note: boot-test-harness.img won't be built by default, it needs
      explicit `make bootimage_test_harness`.

Bug: 140036184
Test: `m bootimage_test_harness`, flashes boot-test-harness.img and checks
      adb root works and test harness props are set.
Test: `m bootimage_test_harness dist -j32`, checks both
      boot-test-harness.img and ramdisk-test-harness.img are under ./out/dist/.
Test: `system/tools/mkbootimg/unpack_bootimg.py --boot_img $OUT/boot-test-harness.img --out ramdisk-test-harness`,
      checks the extracted out/ramdisk is as expected
Test: Run `gunzip -c ramdisk | cpio -idm` for the ramdisk extracted from
      $OUT/boot-test-harness.img and $OUT/boot-debug.img, respectively.
      Then compare the root dirs of both, e.g.,
      `diff -rq --no-dereference ./ramdisk-test-harness ./ramdisk-debug`
Test: `m ramdisk_test_harness-nodeps` and `m bootimage_test_harness-nodeps`
Change-Id: Iadea0b5c933c3b7fa10dcf3d9e85596916b3333d
2019-10-08 10:22:13 +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
67efb885ba Merge "releasetools: Update OWNERS." am: 7e49064030
am: b945f9692e

Change-Id: I2f644488f2ec5796ccddcf638364c952d0bb5d55
2019-10-07 19:25:25 -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
f188d1e32b Merge "Check if installable before installing unstripped" am: 4dc0c25643
am: 6ba261edf0

Change-Id: Id75f6dbc161ae671494710eac6c88e3e54690d8e
2019-10-07 17:22:21 -07: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
b6d4556896 Merge "releasetools: Update the handling of recovery fstab." am: 7b1c49a70d
am: 802fd89263

Change-Id: If4e1b15dee0077a625935ff0f5f309a391be5f1d
2019-10-07 13:08:37 -07: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
c3825ae130 Merge "Enforce the consistency between AB_OTA_UPDATER and AB_OTA_PARTITIONS." am: e3c95f71e7
am: 34bd354511

Change-Id: Id6380258de35c93ccc1dbdfcfc7c806ad6141fb9
2019-10-07 12:36:12 -07:00
Tao Bao
7b1c49a70d Merge "releasetools: Update the handling of recovery fstab." 2019-10-07 19:33:21 +00:00
Tao Bao
4bdfb36549 Merge "releasetools: Fix releasetools_py3_test." am: ae3a9a138d
am: fa4ea59837

Change-Id: Ic9e91053ccb2347dfb0c218fd268beb380933b39
2019-10-07 12:32:51 -07: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
c32a0ccd3c Merge "releasetools: Update tests to match SparseImage change." am: d253f8a614
am: e3fdc126c4

Change-Id: I6886609ce22674553c889a2f2de5443fd1f9e8fe
2019-10-07 12:13:00 -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
1faa3ffe94 Merge "Unconditionally install shim apex on system partition" am: 42b2b54c2b
am: e542a799c8

Change-Id: I112f4eb54236c7bb636b1ea5243c892deb0b7243
2019-10-07 08:42:10 -07: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
Anton Hansson
3c5a18fc16 Document SYSTEM_OTHER_ODEX_FILTER matching
...and add a CleanSpec for the moving preopt files.

Bug: 141707536
Test: N/A
Change-Id: I2f5bc4e2c8e6a9fa4c562d55623c13682d3f93ba
2019-10-07 14:29:58 +01:00
Anton Hansson
2c5def62dc Disable vendor path check for mainline variants
This matches what is done for mainline_system_arm64
(in this particular branch).

Test: lunch mainline_system_x86 && m nothing
Change-Id: I4eb236d086bd36b4821ed11411fa404f2d45f2b9
Merged-In: I607781ce7c6299cbc98c54c683d04db3b65c2e21
2019-10-07 13:51:33 +01: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
de7d8b19b6 Merge "Clean up mainline whitelist in aosp_product.mk" am: 8ca4bf76d6
am: c4ca72d8e9

Change-Id: Ib92468e3bf638d31ff7dd2fa02ef32237bc52e6c
2019-10-07 03:43:08 -07:00
Roland Levillain
6a3e54b47f Merge "Introduce build variable OVERRIDE_TARGET_FLATTEN_APEX." am: 81681abfef
am: 0a24633ef5

Change-Id: Id67efdb4a883e38caf90cf34c0fb8f91fba19aca
2019-10-07 03:41:22 -07:00
Yo Chiang
afcd8eb64c Merge "Add x86 / x86_arm mainline_system product" am: 16652990ec
am: 2214b0fb08

Change-Id: I0e72f39fe0885a9086ecedd7c61bf58e8117f941
2019-10-07 03:40:54 -07:00