Commit graph

52797 commits

Author SHA1 Message Date
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
Anton Hansson
8a408a5d9f Merge "Don't sign auto-generated RROs with platform cert" 2019-05-02 10:50:57 +00: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
Bowgo Tsai
50e9962a53 Merge "Removing --flag 2 when building GSI vbmeta.img" am: ab0ed975f0
am: 4b1e25af26

Change-Id: I0699a913794e3d80bbe7629f9a05b20360f771d8
2019-04-30 01:39:09 -07:00
Bowgo Tsai
4b1e25af26 Merge "Removing --flag 2 when building GSI vbmeta.img"
am: ab0ed975f0

Change-Id: I79de71cf5e65133ff117e90c057f39b0afd09a44
2019-04-30 01:21:39 -07:00
Treehugger Robot
ab0ed975f0 Merge "Removing --flag 2 when building GSI vbmeta.img" 2019-04-30 08:06:34 +00:00
Yifan Hong
75ed2e7f11 Add BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT flag.
If set to true,
- super.img is built from images in $PRODUCT_OUT
- super.img is built to $PRODUCT_OUT
- super.img is built when 'make'.

'make dist' still builds super image from images in target files to
intermediates directory.

This flag is useful for virtual devices, but isn't intended to be set for
actual devices. For actual devices, userspace fastboot should flash
super_empty.img and individual user images separately.

Test: on cuttlefish (flag is set),
      make            # generates $OUT/super.img
      make superimage # generates $OUT/super.img
Test: on real non-retrofit DAP device (flag is not set)
      make            # no super.img is generated
      make superimage # generates $OUT/obj/PACKAGING/.../super.img
      make dist       # generates out/dist/super.img

Bug: 113175337

Change-Id: Ieb81e4fbb663bb4b69e9962c3fa9f16b03aeb907
(cherry picked from commit acd862aed3)
Merged-In: Ieb81e4fbb663bb4b69e9962c3fa9f16b03aeb907
2019-04-29 16:41:32 -07:00
Mathieu Chartier
b37c79c3a2 Add PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS
For enabling per product configuration of resolving startup
const strings.

Bug: 130217075
Bug: 131310042
Test: make
Change-Id: I51cb8931b915a710ab584f954b7a99c7a651d914
2019-04-29 11:23:26 -07:00
Yifan Hong
0e97dbb8ca 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
2019-04-29 10:50:42 -07:00
Yifan Hong
e5ff4770d2 [automerger skipped] Merge changes from topic "productmanifest" into qt-dev
am: 46f7e88c27 -s ours
am skip reason: change_id I49c8083e0e7185ae7b96047d68f1f624b1113dfc with SHA1 51d375610c is in history

Change-Id: I40962ca176b8a877b782e1df393d270cecd3fd1c
2019-04-26 17:38:52 -07:00
Yifan Hong
ca74eab490 [automerger skipped] ota_from_target_files: include metadata when odm / product is changed.
am: 2dcc1dcf9c -s ours
am skip reason: change_id I49c8083e0e7185ae7b96047d68f1f624b1113dfc with SHA1 51d375610c is in history

Change-Id: If4f7c45d5efecf96b8b66f355bee51957a1e4371
2019-04-26 16:55:21 -07:00
Tao Bao
44e50526f3 releasetools: Accept PRESIGNED keys in apexkeys.txt.
am: 548db7d797

Change-Id: I3a18a2805622d76032eca95b9d7cd886bf1929d9
2019-04-26 16:53:47 -07:00
Tao Bao
7ccec4fe8a Merge "releasetools: GetCareMap supports non-sparse image." am: 0376d7dcbb
am: 3d32417e74

Change-Id: I322fc45909f624667df3f1ec75a8d485ad24ead2
2019-04-26 16:15:46 -07:00
Tao Bao
3d32417e74 Merge "releasetools: GetCareMap supports non-sparse image."
am: 0376d7dcbb

Change-Id: Iec0fd91578944aef61a7b0756f5139a429365395
2019-04-26 16:10:36 -07:00
Tao Bao
0376d7dcbb Merge "releasetools: GetCareMap supports non-sparse image." 2019-04-26 22:59:30 +00:00
Yifan Hong
46f7e88c27 Merge changes from topic "productmanifest" into qt-dev
* changes:
  ota_from_target_files: include metadata when odm / product is changed.
  Add product manifest.
2019-04-26 22:39:01 +00:00
Yifan Hong
7bf94ac60a Merge "Add BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT flag." am: 8bfcc69e38
am: c8be0f5942

Change-Id: I0c24addbe00f628657f470eb45637aa3702a3c0c
2019-04-26 14:42:27 -07:00
Yifan Hong
c8be0f5942 Merge "Add BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT flag."
am: 8bfcc69e38

Change-Id: I99aed3cf8bc50b29000d3e48cc12a75c331bdb7c
2019-04-26 14:37:16 -07:00
Yifan Hong
8bfcc69e38 Merge "Add BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT flag." 2019-04-26 21:30:07 +00:00
Yifan Hong
f17f1f6eef Merge "Fix mainline_mixed build" am: 484a6e53c1
am: f97b171594

Change-Id: I6bc6b76d21e49a5ade540b8130530d87e1eb7fc2
2019-04-26 14:17:43 -07:00
Yifan Hong
f97b171594 Merge "Fix mainline_mixed build"
am: 484a6e53c1

Change-Id: Ie705c3c24ee2a02534605eed5624a2cb826ef1ea
2019-04-26 14:12:35 -07:00
Yifan Hong
484a6e53c1 Merge "Fix mainline_mixed build" 2019-04-26 20:56:25 +00:00
Yifan Hong
7e6397c2d5 Fix mainline_mixed build
build_mixed script can't merge system and product VINTF
data yet.

Fixes: 131418170
Bug: 131425279
Test: build 'target_files_package' for 'mainline_system_google_arm64',
see META/system_manifest.xml

Change-Id: I366d9bc802ee0e6bdf8fe480303f3fee827c579d
2019-04-26 12:30:31 -07:00
Pete Bentley
c3b9f66cd1 Merge "Remove libjavacrypto from system image." am: 4ec15d2c50
am: 229ba6c8ee

Change-Id: Ic879fa9a3b3137182ab77150fee563303148f3d4
2019-04-26 11:14:36 -07:00
Pete Bentley
229ba6c8ee Merge "Remove libjavacrypto from system image."
am: 4ec15d2c50

Change-Id: Iae834b4f29129f8f596b510804eb23b3764a9071
2019-04-26 11:09:26 -07:00
Treehugger Robot
4ec15d2c50 Merge "Remove libjavacrypto from system image." 2019-04-26 18:00:38 +00:00