Commit Graph

52838 Commits

Author SHA1 Message Date
Tao Bao
721a294a1c Merge "Update the references to verity tools." am: 31c2bf905e
am: ee153db46a

Change-Id: I9f6b38c0538b8b0e9146c622dfb807f170398c8d
2019-05-03 06:59:30 -07:00
Tao Bao
ee153db46a Merge "Update the references to verity tools."
am: 31c2bf905e

Change-Id: I83f5ec259273007f7ba61e486a0150e8ef9b69e8
2019-05-03 06:51:19 -07:00
Tao Bao
31c2bf905e Merge "Update the references to verity tools." 2019-05-03 13:41:45 +00:00
Bowgo Tsai
21fe762b2d [automerger skipped] Merge "Removing --flag 2 when building GSI vbmeta.img" into qt-dev
am: c2bbeae797 -s ours
am skip reason: change_id I067dcda15f14f04428e0b60ce1f49227d61e4349 with SHA1 2e2a7682ba is in history

Change-Id: Ic785f2d9b51c30803de0837825bc614b25d97c15
2019-05-02 20:53:34 -07:00
TreeHugger Robot
c2bbeae797 Merge "Removing --flag 2 when building GSI vbmeta.img" into qt-dev 2019-05-03 03:17:29 +00:00
Dan Willemsen
845cfe1063 Merge "BUILD_(HOST|TARGET)_TEST_CONFIG errors by default" am: 1c5610915f
am: ce13dc41fa

Change-Id: Ie8bc30809e9bb04ef0d9188c0fd7961fa2b862ee
2019-05-02 19:06:20 -07:00
Dan Willemsen
ce13dc41fa Merge "BUILD_(HOST|TARGET)_TEST_CONFIG errors by default"
am: 1c5610915f

Change-Id: I56ada506477223052d2913fc17b71684d8c858cb
2019-05-02 18:36:59 -07:00
Tao Bao
d5ab10eed4 Update the references to verity tools.
Test: `m -j dist` with aosp_marlin-userdebug
Test: `atest releasetools_test`
Test: Run signing with otatools.
Test: TreeHugger
Change-Id: I60d5bad4435d588c5f97b2245ca67ed3d55299b7
2019-05-02 18:32:11 -07:00
Treehugger Robot
1c5610915f Merge "BUILD_(HOST|TARGET)_TEST_CONFIG errors by default" 2019-05-03 00:47:09 +00:00
Anton Hansson
0284f253eb [automerger skipped] Merge "Remove unneeded bootimage properties" into qt-dev
am: 669a9dbd99 -s ours
am skip reason: change_id Ibbeff9870a5b71e83c2cceeb1327b12600077b23 with SHA1 f299889513 is in history

Change-Id: I5c9358fc0121351de8811c7fb51238590d7b48f7
2019-05-02 17:12:59 -07:00
Jiyong Park
2dd4e28cb9 Merge "Revert "Temporarily not inheriting updatable_apex.mk"" into qt-dev
am: 63513e2b7d

Change-Id: Id6bceba64596b9a70db28fae8acd081ca14c9c2b
2019-05-02 16:25:00 -07:00
Dan Willemsen
64eaddf6c8 BUILD_(HOST|TARGET)_TEST_CONFIG errors by default
They've been warnings for two weeks, with no reports of problems,
and no warnings in the logs that I can search.

Fixes: 130723115
Fixes: 130734993
Test: treehugger
Change-Id: I61b8b5f35905d45fa7cab9914580ae6c005e83dc
2019-05-02 22:17:12 +00:00
Ian Pedowitz
cb83f8c594 Merge "Revert "RESTRICT AUTOMERGE Updating the platform sdk version for Q"" into qt-dev
am: 277bf1ae79

Change-Id: Ib797e7e2a82f181dbab7d031ade96e4be784ad81
2019-05-02 14:49:57 -07:00
Ian Pedowitz
f3213ae7d8 Merge "RESTRICT AUTOMERGE Updating the platform sdk version for Q" into qt-dev
am: 72cb9c892d

Change-Id: I5dc918143d23758b77ff8be9a29788880d0b87cc
2019-05-02 14:16:16 -07:00
Bo Hu
a3434e3c0f Merge "emulator: support dynamic partitions" into qt-dev-plus-aosp 2019-05-02 20:25:56 +00:00
Calin Juravle
d7f57d4114 Merge "Rename PRODUCT_USES_ART to PRODUCT_USES_DEFAULT_ART_CONFIG" am: c23e013814
am: 569835bf14

Change-Id: Iab52c7daa14bbe671a37d5ea585255f8af10abf7
2019-05-02 11:17:43 -07:00
Calin Juravle
569835bf14 Merge "Rename PRODUCT_USES_ART to PRODUCT_USES_DEFAULT_ART_CONFIG"
am: c23e013814

Change-Id: Ia5033ac1def98c4f71d03a9760b5072dc62dfe58
2019-05-02 11:12:36 -07:00
Calin Juravle
c23e013814 Merge "Rename PRODUCT_USES_ART to PRODUCT_USES_DEFAULT_ART_CONFIG" 2019-05-02 17:56:11 +00:00
Lajos Molnar
a03b857a96 [automerger skipped] Merge "allow actually 140MB vendor partition space" am: ad52781bdc
am: aa752b266d -s ours
am skip reason: change_id I93bfe7f25f16a8e48871db7357ec587c21dcc7d6 with SHA1 0fb6fcca27 is in history

Change-Id: I406de917581bb62c542e5e7abc92df492ad95d3e
2019-05-02 09:43:19 -07:00
Lajos Molnar
aa752b266d Merge "allow actually 140MB vendor partition space"
am: ad52781bdc

Change-Id: I441a7935ff6fe0a4ff6fb869ec82bf6d9c4e1345
2019-05-02 09:38:10 -07:00
bohu
a3deb4f04b emulator: support dynamic partitions
BUG: 125540538

Change-Id: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
2019-05-02 09:32:06 -07:00
Treehugger Robot
ad52781bdc Merge "allow actually 140MB vendor partition space" 2019-05-02 16:16:41 +00:00
Tao Bao
fd6849faf0 Merge "releasetools: Skip on empty care_map." am: 65e41c4236
am: b45a15da18

Change-Id: If162f2fa1c627d4820b3acfd807af8a7b454fa5d
2019-05-02 08:48:29 -07:00
Tao Bao
b45a15da18 Merge "releasetools: Skip on empty care_map."
am: 65e41c4236

Change-Id: I1afdf0942b3899d1f3b1be96ddfba9150cc8a863
2019-05-02 08:43:21 -07:00
Tao Bao
65e41c4236 Merge "releasetools: Skip on empty care_map." 2019-05-02 15:35:55 +00:00
Lajos Molnar
bf77eecd3d allow actually 140MB vendor partition space
Bug: 129710438
Change-Id: I93bfe7f25f16a8e48871db7357ec587c21dcc7d6
Merged-In: I93bfe7f25f16a8e48871db7357ec587c21dcc7d6
2019-05-02 15:18:33 +00:00
Martin Stjernholm
e0db852037 Merge "Add libs that have been resolved to the library absence check." am: a6dc671385
am: 6806771997

Change-Id: If65dfcdf5492918ad4dc6f1e6d48d6087feadb8d
2019-05-02 07:26:05 -07:00
Martin Stjernholm
6806771997 Merge "Add libs that have been resolved to the library absence check."
am: a6dc671385

Change-Id: I3026488fef467bda281a7212d73c8a50fedd8d92
2019-05-02 07:20:53 -07:00
Martin Stjernholm
a6dc671385 Merge "Add libs that have been resolved to the library absence check." 2019-05-02 14:05:46 +00:00
Anton Hansson
40bf1ef09f Merge "Don't sign auto-generated RROs with platform cert" am: 8a408a5d9f
am: 476f0332ab

Change-Id: Ia4234e928f942e84803585a13241b039e738a126
2019-05-02 04:11:36 -07:00
Anton Hansson
476f0332ab Merge "Don't sign auto-generated RROs with platform cert"
am: 8a408a5d9f

Change-Id: Ic62c4ab6dd3716389db03dd420b809eee5c3c19f
2019-05-02 04:06:27 -07:00
Martin Stjernholm
ee30c73c63 Add libs that have been resolved to the library absence check.
Note: libtombstoned_client.so was moved from the Runtime APEX to system with
http://r.android.com/941388.

Test: m systemimage
Bug: 124293228
Bug: 131587358
Change-Id: I9e517d3c2344b39cf2743a34723572e646675677
2019-05-02 12:01:02 +01:00
Anton Hansson
8a408a5d9f Merge "Don't sign auto-generated RROs with platform cert" 2019-05-02 10:50:57 +00:00
Anton Hansson
669a9dbd99 Merge "Remove unneeded bootimage properties" into qt-dev 2019-05-02 08:24:48 +00:00
TreeHugger Robot
63513e2b7d Merge "Revert "Temporarily not inheriting updatable_apex.mk"" into qt-dev 2019-05-02 07:03:33 +00:00
Tao Bao
77a4aa0c06 releasetools: Skip on empty care_map.
common.GetCareMap() may return an empty list on unavailable care_map
since the change in commit 8bdfb990ea.
Caller needs to handle such a case accordingly. This CL fixes the caller
in add_img_to_target_files.py, and changes the return value to None to
break legacy callers loudly.

Fixes: 131794385
Test: `atest releasetools_test`
Change-Id: I7c94f456064199237e84ef75732bdd10ebe31736
2019-05-01 22:21:25 -07:00
Ian Pedowitz
277bf1ae79 Merge "Revert "RESTRICT AUTOMERGE Updating the platform sdk version for Q"" into qt-dev 2019-05-02 00:59:09 +00:00
Ian Pedowitz
842119ab3a Revert "RESTRICT AUTOMERGE Updating the platform sdk version for Q"
This reverts commit 5e0226b816.

Reason for revert: QT SDK Finalization. Will be merged again on/after May 13th

Bug: 129975435
Change-Id: Ia3693b2a4907c4ca9be56cfe18fda35b8545abba
2019-05-02 00:55:38 +00:00
Ian Pedowitz
72cb9c892d Merge "RESTRICT AUTOMERGE Updating the platform sdk version for Q" into qt-dev 2019-05-02 00:53:29 +00:00
Calin Juravle
cdff6b1451 Rename PRODUCT_USES_ART to PRODUCT_USES_DEFAULT_ART_CONFIG
It better describes what is meant to represent.

Test: m build
Change-Id: I942721cee2c7eaef625bf8c64aae32c1725705eb
2019-05-01 15:35:03 -07:00
Mathieu Chartier
c1b4e3e4dc [automerger skipped] Merge "Add PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS" am: 3b77053daf
am: 6a6f8f6e2f -s ours
am skip reason: change_id I51cb8931b915a710ab584f954b7a99c7a651d914 with SHA1 b37c79c3a2 is in history

Change-Id: Ifc489e5139b3ec0556b95d9a9abbe0f6ec6c918f
2019-05-01 14:31:58 -07:00
Anton Hansson
064f04343f Merge "Remove unneeded bootimage properties" am: 1739f23404
am: b5acdba94f

Change-Id: I0490824254c42cd1feb1d41d63923ab193de0d4b
2019-05-01 14:30:19 -07:00
Mathieu Chartier
6a6f8f6e2f Merge "Add PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS"
am: 3b77053daf

Change-Id: I6269c56ddb7d407eea5feb4cc8bb0322889245de
2019-05-01 13:49:11 -07:00
Anton Hansson
b5acdba94f Merge "Remove unneeded bootimage properties"
am: 1739f23404

Change-Id: Ifeb9f40654567ca67acc5640d76aade074240b49
2019-05-01 13:47:43 -07:00
Mathieu Chartier
3b77053daf Merge "Add PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS" 2019-05-01 20:29:20 +00:00
Anton Hansson
1739f23404 Merge "Remove unneeded bootimage properties" 2019-05-01 20:10:31 +00:00
Yifan Hong
5926dc6f77 [automerger skipped] Merge "Add BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE flag." into qt-dev
am: d8900299d7 -s ours
am skip reason: change_id I94e33091d0c837cae40776176b4dcfdd338aba90 with SHA1 0e97dbb8ca is in history

Change-Id: I97369535e593a465ff9a0276e2f587bdee93a87d
2019-05-01 12:27:38 -07:00
Yifan Hong
d8900299d7 Merge "Add BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE flag." into qt-dev 2019-05-01 18:00:33 +00:00
Anton Hansson
0db6e92129 Don't sign auto-generated RROs with platform cert
Preinstalled overlays needn't be signed with the same cert
as the package it overlays, simply being preinstalled is
enough. Sign with the default cert instead for now, which
provides fewer special privileges.

Bug: 129373833
Test: internal overlay test
Change-Id: Ie18f7ff749e3f079600f74203664bcb6d11f9d6a
2019-05-01 16:42:56 +01:00
Jaewoong Jung
a1e6e85035 [automerger skipped] Merge "Skip unneeded notice files for ETC modules." into qt-dev
am: 258fbef820 -s ours
am skip reason: change_id Ic7931f990369f744c8de62956a1a0a9c0451d6ab with SHA1 dca3186b84 is in history

Change-Id: Idb726358cadb694e4524fe5e0ed6334280c32a84
2019-05-01 06:06:36 -07:00