Commit Graph

50161 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Yifan Hong
a2488b7d85 Merge "Add BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE flag." 2019-04-30 19:49:12 +00: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
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
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
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
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
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
Martin Stjernholm
13b81b4eee Merge "Ignore vndk-* subdirectories in the library absence check."
am: eccbfd5f4e

Change-Id: I11ce739914f8058c56db505050c3141d2f085270
2019-04-26 07:40:48 -07:00
Treehugger Robot
eccbfd5f4e Merge "Ignore vndk-* subdirectories in the library absence check." 2019-04-26 14:23:54 +00:00
Martin Stjernholm
60bb358221 Ignore vndk-* subdirectories in the library absence check.
They only contain prebuilts from older releases.

Test: m systemimage on affected internal lunch targets
Bug: 124293228
Change-Id: I059c9d0edb78e52838a25cef0472807847d77417
2019-04-26 12:12:34 +00:00
Pete Bentley
f9dd05f1bf Remove libjavacrypto from system image.
The only copy needed is the one in the Conscrypt APEX.

Bug: 123925742
Test: m
Change-Id: Ieea8549d047750cf3580d6fe0204fdf55b6b8394
2019-04-26 10:28:16 +01:00
Bill Peckham
3891ce9ed4 Merge "Fix missing import."
am: 3129d2c971

Change-Id: I158729c0f950673419345a73ff8f0b728c116fd4
2019-04-25 19:49:52 -07:00
Bill Peckham
3129d2c971 Merge "Fix missing import." 2019-04-26 02:38:08 +00:00
Yifan Hong
4d90d659c8 Merge changes from topic "productmanifest"
am: 001ebfcb30

Change-Id: Ie7806253b89c01d6344c1ddca3126a23b6ae4ed9
2019-04-25 16:10:36 -07:00
Yifan Hong
001ebfcb30 Merge changes from topic "productmanifest"
* changes:
  ota_from_target_files: include metadata when odm / product is changed.
  Add product manifest.
2019-04-25 22:51:27 +00:00
Bill Peckham
540d91ae3f Fix missing import.
Test: Verify that script runs properly now that import is present.
Change-Id: I255bc6ca2ba1f2cc387001c6f4bf9690a90eb47c
2019-04-25 14:18:16 -07:00
Yifan Hong
acd862aed3 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
2019-04-25 10:51:35 -07:00
Yifan Hong
51d375610c ota_from_target_files: include metadata when odm / product is changed.
When odm is changed, device manifest/matrices should be included.
When product is changed, framework manifest/matrices should be included.

Bug: 130714844
Bug: 126770403
Test: build with odm and product VINTF metadata

Change-Id: I49c8083e0e7185ae7b96047d68f1f624b1113dfc
2019-04-25 10:22:39 -07:00
Yifan Hong
51e87262c2 Add product manifest.
- Rename framework_manifest.xml to system_manifest.xml since that's more accurate.
- Add product_manifest.xml to base_product.mk
- Add product_manifest.xml to verified_assembled_framework_manifest.xml to check
  it at build time.

Bug: 126770403
Bug: 130714844
Bug: 80547152

Test: build and inspect output
Test: lshal

Change-Id: I1b447d8c36f72768e28e9bcaa4d06afdeba08c2a
2019-04-25 10:22:36 -07:00
Bill Peckham
d40f5b6ec0 Merge "Sort content of merged target files package."
am: d540f5a9a5

Change-Id: I9204ac1023b2d4bc8c8c2a383e4991bdd700518f
2019-04-25 09:32:57 -07:00
Bill Peckham
d540f5a9a5 Merge "Sort content of merged target files package." 2019-04-25 16:19:47 +00:00
Tao Bao
8bdfb990ea releasetools: GetCareMap supports non-sparse image.
Test: `atest --host releasetools_test`
Test: `m dist` with a target that uses non-sparse images.
Test: Run UpdateVerifierTest on blueline.
Change-Id: I8fdebee42fcaac78c2d1be2a84ddb69f46ec701d
2019-04-25 09:15:07 -07:00
Tao Bao
541468bb9a Merge "releasetools: Accept PRESIGNED keys in apexkeys.txt."
am: b5b055ab50

Change-Id: Ib69611f76e26ad0a78a1468704700ff437dcfe0e
2019-04-25 07:48:52 -07:00
Tao Bao
b5b055ab50 Merge "releasetools: Accept PRESIGNED keys in apexkeys.txt." 2019-04-25 14:34:00 +00:00
Inseob Kim
d12cfcfde5 Merge "Build contexts files with Soong"
am: 23cbf2b1b5

Change-Id: I1fed7bf15ad786e02ddd2046f8faac014b1433b1
2019-04-25 00:52:01 -07:00
Treehugger Robot
23cbf2b1b5 Merge "Build contexts files with Soong" 2019-04-25 07:46:19 +00:00
Tao Bao
f454c3a0b4 releasetools: Accept PRESIGNED keys in apexkeys.txt.
For an PRESIGNED APEX, it has the following format, which should be
considered as a valid input.

name="foo.apex" public_key="PRESIGNED" private_key="PRESIGNED" container_certificate="PRESIGNED" container_private_key="PRESIGNED"

Bug: 131153746
Test: Run sign_target_files_apks.py on a target_files.zip with PRESIGNED
      APEXes.
Test: python -m unittest sign_target_files_apks
Change-Id: I51076b0c6eddfb75637d37659a08009f0a88e931
2019-04-25 00:10:07 -07:00
Tao Bao
ff354bf918 Merge "releasetools: PRESIGNED APEX container entails PRESIGNED payload."
am: a212ab59df

Change-Id: I24e61e46c4b420bc15f074188efbcff71a337b85
2019-04-24 19:13:58 -07:00