Commit graph

52821 commits

Author SHA1 Message Date
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
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
TreeHugger Robot
258fbef820 Merge "Skip unneeded notice files for ETC modules." into qt-dev 2019-05-01 12:55:39 +00:00
Anton Hansson
f299889513 Remove unneeded bootimage properties
These were added as part of http://r.android.com/731514, but
most of these properties make no sense for the bootimage. Revert
to only defining date, date.utc and fingerprint.

Bug: 131066061
Test: inspect vendor/build.prop
Test: boot, no SELinux warnings for removed props
Change-Id: Ibbeff9870a5b71e83c2cceeb1327b12600077b23
2019-05-01 13:20:27 +01:00
Pete Bentley
381e24fb4d [automerger skipped] Merge "Remove libjavacrypto from system image." into qt-dev
am: feef8d4af5 -s ours
am skip reason: change_id Ieea8549d047750cf3580d6fe0204fdf55b6b8394 with SHA1 f9dd05f1bf is in history

Change-Id: Ibfd03ac011c48b65fd585e28d3d6e53c71783430
2019-05-01 04:56:29 -07:00
Pete Bentley
feef8d4af5 Merge "Remove libjavacrypto from system image." into qt-dev 2019-05-01 11:27:29 +00:00
Jaewoong Jung
48483a6903 Skip unneeded notice files for ETC modules.
Non-installable, non-library modules can still have notice files
attached if they are bundled in an apex module, in which case the
current make setting would generate an error. This change makes it just
ignore them silently if the module is ETC. Other classes will still
trigger an error.

Bug: 130138217
Test: manual build + TreeHugger
Merged-In: Ic7931f990369f744c8de62956a1a0a9c0451d6ab
Change-Id: Ic7931f990369f744c8de62956a1a0a9c0451d6ab
(cherry picked from commit dca3186b84)
2019-05-01 00:40:50 +00:00
Mathieu Chartier
b9dc792b19 Add PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS
For enabling per product configuration of resolving startup
const strings.

Bug: 130217075
Bug: 131310042
Test: make

(cherry picked from commit b37c79c3a2)

Merged-In: I51cb8931b915a710ab584f954b7a99c7a651d914
Change-Id: I0ecc7823620bca9f252b3d91b82982db91dd248d
2019-04-30 17:00:19 -07:00
Mathieu Chartier
7ab6932a0a Merge "Add PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS" into qt-dev
am: b5ce621e6b

Change-Id: I55d40a89751fac3f2a1211f6bbb5ea3c8472db18
2019-04-30 14:33:05 -07:00
Yifan Hong
e834be384e Merge "Add BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE flag." am: a2488b7d85
am: 6e2eb931a7

Change-Id: I7d1520bdaa9057680ecc3496d7baf2539d25d9e4
2019-04-30 13:14:11 -07:00
Yifan Hong
7f7537611f [automerger skipped] Add BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT flag.
am: 75ed2e7f11 -s ours
am skip reason: change_id Ieb81e4fbb663bb4b69e9962c3fa9f16b03aeb907 with SHA1 acd862aed3 is in history

Change-Id: Iff55520636a3604d7ff424e6ba33681902a49fc6
2019-04-30 13:12:33 -07:00
Yifan Hong
6e2eb931a7 Merge "Add BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE flag."
am: a2488b7d85

Change-Id: Ib1cf76a73247e6f92809d14a5279d750f96d1a34
2019-04-30 13:06:58 -07:00
Mathieu Chartier
b5ce621e6b Merge "Add PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS" into qt-dev 2019-04-30 20:03:52 +00:00
Yifan Hong
a2488b7d85 Merge "Add BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE flag." 2019-04-30 19:49:12 +00:00
Pete Bentley
5a78b371ed Remove libjavacrypto from system image.
The only copy needed is the one in the Conscrypt APEX.

Bug: 123925742
Test: m
Change-Id: Ieea8549d047750cf3580d6fe0204fdf55b6b8394
Merged-In: Ieea8549d047750cf3580d6fe0204fdf55b6b8394
2019-04-30 20:36:18 +01:00
Yifan Hong
7df64c3e77 Add BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE flag.
When set, product-img-tag.zip contains super.img instead of individual
user images from target files. For virtual devices, super.img is needed
to boot the device, but individual user images aren't needed.

Test: on A/B DAP, with flag set:
     - m updatepackage and look at img.zip
     - img_from_target_files
     both have super.img and not system / vendor / system_other
Test: on non-A/B DAP, with the flag set:
     - m updatepackage and look at img.zip
     - img_from_target_files
     both have super.img and not system / vendor
Test: on A/B retrofit, with the flag set:
     - m updatepackage and look at img.zip
     - img_from_target_files
     both have super_*.img and system_other.img, but not system / vendor
Bug: 113175337

Change-Id: I94e33091d0c837cae40776176b4dcfdd338aba90
(cherry picked from commit 0e97dbb8ca)
Merged-In: I94e33091d0c837cae40776176b4dcfdd338aba90
2019-04-30 11:36:16 -07:00