Commit Graph

19034 Commits

Author SHA1 Message Date
Treehugger Robot
5eba1c9a67 Merge "Compute the needed shared libs for otatools." 2019-05-08 03:44:33 +00:00
Tao Bao
f7d0b06ee9 Merge "Use the installed vboot_signer."
am: 40c03ff116

Change-Id: I6369c9779b84c8d0cd9f5baafa9094426b946846
2019-05-07 17:51:20 -07:00
Tao Bao
40c03ff116 Merge "Use the installed vboot_signer." 2019-05-07 23:40:57 +00:00
android-build-team Robot
24df732a99 Make change and version bump to PPRL.190505.001
Change-Id: Ib519bb6075266b713971491a5d67cd942c6d67a8
2019-05-07 22:12:39 +00:00
Colin Cross
2022a3bea7 Merge "Use --ignore_missing_files when creating symbols.zip"
am: 96ba044c94

Change-Id: I6374ab49d0307dfe55ca940880987f596bbb353c
2019-05-07 14:56:24 -07:00
Colin Cross
8d34244739 Use --ignore_missing_files when creating symbols.zip
symbols.zip is created while files that are not part of the platform
build but were requested on the Make command line (for example by
passing "tests") are still being installed.  Installation often
involves removing and then recreating the file.  If the file
exists when the list of files to be zipped is created, but is
removed when soong_zip is zipping, it fails with an error.  Pass
--ignore_missing_files to silence the error and keep zipping.

Fixes: 79503862
Test: m checkbuild
Change-Id: I1fbbf1f1396948288ee133c319b2e19dee97983b
2019-05-07 11:47:13 -07:00
Chris Gross
a784ef197c Add BUILD_RECOVERY_IMAGE and BUILD_BOOT_IMAGE flags
Bug: 123428770
Test: Built system-only image and checked that no boot.img or
recovery.img files where created. Booted the resulting merged build on
device.

Change-Id: I760476502775e68125907c39e66b8665e789a798
2019-05-07 11:00:37 -07:00
Anton Hansson
4550977e75 Merge "Mark many single value variables as such"
am: c43a3e1103

Change-Id: Ieae944df8cb9be17ab6af35bc43959ed532fac1e
2019-05-07 02:33:30 -07:00
Anton Hansson
4d60168865 Merge "Add support for single-value product variables"
am: 3e29407793

Change-Id: I190269b39392c5daf70e84d50b68432b80a66ef5
2019-05-07 02:32:48 -07:00
Anton Hansson
c43a3e1103 Merge "Mark many single value variables as such" 2019-05-07 09:18:53 +00:00
Anton Hansson
3e29407793 Merge "Add support for single-value product variables" 2019-05-07 09:14:27 +00:00
Tao Bao
96daeebd0e Compute the needed shared libs for otatools.
This keeps the packed shared libs in sync with their executables.

This CL also changes the packing location of mke2fs.conf, from
system/extras/ext4_utils/mke2fs.conf to bin/mke2fs.conf.

Bug: 34738751
Test: `m -j otatools-package`. Compare the packed files against the ones
      prior to this CL.
Change-Id: Icae88e3cd898460f5ba7dc11ab8a57350630c432
2019-05-06 20:03:57 -07:00
Tao Bao
d14c2f88df Use the installed vboot_signer.
Bug: 34738751
Test: Set `PRODUCT_SUPPORTS_VBOOT := true` and `m -j otatools-package`.
      Check the packed tools.
Test: Set `PRODUCT_SUPPORTS_VBOOT := true` and `m -j bootimage`.
Change-Id: Ia2ea475e3dc03cada1da524a299a21b8ad7ed536
2019-05-06 20:03:24 -07:00
Bowgo Tsai
f446127bfd Merge "Using a test key to sign boot-debug.img if needed"
am: 38809bdf99

Change-Id: Id87fa9dff8cb390a12fc41bb37bdba126a1ae2d1
2019-05-06 18:40:34 -07:00
Treehugger Robot
38809bdf99 Merge "Using a test key to sign boot-debug.img if needed" 2019-05-07 01:07:02 +00:00
Tao Bao
844d65efe8 Merge "Remove unused shared libs from otatools."
am: 59c700154b

Change-Id: I0c2be0c51cd10cc375d3fc60d20ba957f0439af4
2019-05-06 09:42:40 -07:00
Tao Bao
59c700154b Merge "Remove unused shared libs from otatools." 2019-05-06 16:32:25 +00:00
Bo Hu
489a1e56bc Merge "emulator: support dynamic partitions"
am: 73c9f03b66

Change-Id: Ibc7a7576746eaa9eed5f2fed3539ee726d2bb630
2019-05-06 08:34:52 -07:00
Anton Hansson
c1c4c0bbf0 Mark many single value variables as such
This changes these variables to not inherit multiple values,
which allow for some more flexibility in how/where they're defined
in makefiles.

Also remove the previous equivalent solution that was in place for
the PRODUCT_BUILD_* flags.

Bug: 116769560
Test: presubmit
Change-Id: Ia27a11d95263ceb45ffa355e75bb2aa6d9672139
2019-05-06 16:19:19 +01:00
Anton Hansson
d26c647f74 Add support for single-value product variables
Prior to this change, all PRODUCT_* variables are inherited with
list semantics, meaning the variable value in the current makefile
as well as all the makefiles it inherits are concatenated together.

Many of these variables are not lists, so this change adds the
ability to classify a variable as a single-value variable, which
will inherit at most one value (the first one), unless the variable
is already defined in the current file.

This change also marks all current variables as list variables.
A future change will re-classify the single-value variables as such.

Bug: 116769560
Test: presubmit
Change-Id: I57719a5eefd0749e92c08b1773b6f929629267a3
2019-05-06 16:17:20 +01:00
Tao Bao
1d642bc382 Remove unused shared libs from otatools.
libcurl-host.so was added for delta_generator (commit f8e6fbe2f5).
libext2_misc.so and libext2_profile-host.so were added for e2fsck and
build_verity_tree (commit d0ec665727). None of them is actively used by
otatools.

Bug: 34738751
Test: `m -j otatools-package`. Unzip and check that there's no missing
      shared libs reported by ldd.
Change-Id: Id229e450f5f2eaa03a6c6cf568a1912add06754c
2019-05-05 20:42:25 -07:00
bohu
9492ee3d1b emulator: support dynamic partitions
BUG: 125540538

Change-Id: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
Merged-In: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
2019-05-05 20:34:02 -07:00
Colin Cross
72abaabbf4 Merge "Support PRESIGNED in soong_app_prebuilt.mk"
am: d4079c5019

Change-Id: I683c3513959c63139bc1412b21adef70a1c15d60
2019-05-03 18:23:54 -07:00
Bowgo Tsai
26b0a26e3e Using a test key to sign boot-debug.img if needed
When /boot partition is chained in AVB signing, libavb will try to
read AVB footer from the end of /boot partition, even if the device is
unlocked. However, this makes device unbootable when the unsigned
boot-debug.img is flashed on /boot partition. This CL uses a test key
from external/avb to sign the boot-debug.img if /boot partition is
chained.

Bug: 126493225
Bug: 129508966
Test: Enables chain partition for boot.img, `make bootimage_debug` then
      checks `avbtool info_image --image $OUT/boot-debug.img`
Test: `make bootimage_debug-nodeps`
Test: boot a device with a chained boot-debug.img

Change-Id: I870cb70c70b7d4d7a30b77bed58cbca6e007d5e3
2019-05-04 09:01:09 +08:00
Treehugger Robot
d4079c5019 Merge "Support PRESIGNED in soong_app_prebuilt.mk" 2019-05-04 00:22:29 +00:00
dimitry
ededd543a2 Merge "Enable native_bridge"
am: 37eadacc20

Change-Id: I5a72caab8eca7c800e3e0167a1da82eeeba2d8b7
2019-05-03 16:08:17 -07:00
Treehugger Robot
37eadacc20 Merge "Enable native_bridge" 2019-05-03 22:23:00 +00:00
Colin Cross
e16405d5ec Merge "Remove reverse-list from java static libraries."
am: 7c485728cf

Change-Id: I50621dc253cf479f8c7befcc4fe933562c8e4f0e
2019-05-03 14:35:28 -07:00
Colin Cross
7c485728cf Merge "Remove reverse-list from java static libraries." 2019-05-03 21:31:47 +00:00
Martin Stjernholm
175f8da975 Merge "Add the library absence check as a kati stage check."
am: 6c0a3af4bf

Change-Id: I638e5838930d100d9771d3690c29bb9e0b4d4a93
2019-05-03 08:19:31 -07:00
Treehugger Robot
6c0a3af4bf Merge "Add the library absence check as a kati stage check." 2019-05-03 15:09:18 +00: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
dimitry
3e63052e2b Enable native_bridge
Bug: http://b/77159578
Test: make
Change-Id: Ia078073ff27e10156d552a7a94b961c020d4e38d
2019-05-03 15:32:15 +02:00
Martin Stjernholm
b0382f0319 Add the library absence check as a kati stage check.
Primarily for use with build_test during presubmit.

Moved the check to main.mk to avoid nonobvious dependency on
product_target_FILES from main.mk to Makefile.

Test: m systemimage
Test: build/soong/build_test.bash
Test: m out/target/product/taimen/system/lib/libdexfile.so; m systemimage;
  check that "find"-based check fails
Test: Add a system library to APEX_MODULE_LIBS; m systemimage;
  check that "product_target_FILES"-based check fails;
  env DISABLE_APEX_LIBS_ABSENCE_CHECK=true m systemimage;
  check that it works
Bug: 124293228
Change-Id: I7a93cc0ac4480404a3d56c75eb43ae499e8a3a05
2019-05-03 13:02:51 +01: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
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
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
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
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
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
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
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