Commit Graph

50342 Commits

Author SHA1 Message Date
Daniel Norman
a61cde0747 Begins merging META/dynamic_partitions_info.txt.
This file is used by OTA generation so it needs to appear in mixed
builds with the combined content from the system and other versions of
the file.

Test: python -m unittest test_merge_target_files
Test: Running merge_target_files on a dynamic-partition-enabled build
and observing the resulting target files.
Bug: 131889742

Change-Id: I4ddbebc087e430f6307d0bd5461121a374e58ea4
2019-05-07 11:53:58 -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
Bill Peckham
db8a8c6799 Merge "Use file_contexts.bin from other build to regenerate images."
am: 7dbbc3075b

Change-Id: Iae50c7e8eeb4411d30922b9047a046a07b2136ad
2019-05-07 10:43:34 -07:00
Bill Peckham
7dbbc3075b Merge "Use file_contexts.bin from other build to regenerate images." 2019-05-07 17:26:25 +00:00
Martin Stjernholm
5055dae50c Remove libc_malloc_{debug,hooks} from the system image.
They are part of Bionic and should now be in the Runtime APEX.

Test: Flash and boot
Bug: 122566199
Bug: 118374951
Change-Id: Ib1a2999b56d743242ef7aafa7aed57f8c6a7b0e5
2019-05-07 17:33:36 +01: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
e7e563c673 Merge "releasetools: Support replacing the signing keys for chained vbmeta."
am: 32d69c6b74

Change-Id: I69b16c955f656b5749fc235c6044d549f340f22b
2019-05-06 20:27:55 -07:00
Tao Bao
32d69c6b74 Merge "releasetools: Support replacing the signing keys for chained vbmeta." 2019-05-07 03:10:35 +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
Bill Peckham
736b223d5f Use file_contexts.bin from other build to regenerate images.
The old process_file_contexts_bin function did not properly generate a usable
file_contexts.bin to regenerate images, so instead use the file_contexts.bin
from the other partial target files package. When combining any one of several
other partial target files packages with a single system partial target files
package, this file will properly apply contexts as long as the same source is
used for the system partial target files.

Test: Verify that file contexts are properlty applied to vendor image.
Bug: 131584454
Change-Id: I16f8cc3b7f2eb7f09746f0ddcb2c1daf3fd19da6
2019-05-06 23:23:23 +00:00
Tao Bao
d6085d6834 releasetools: Support replacing the signing keys for chained vbmeta.
Bug: 131710801
Test: Run sign_target_files_apks.py on a target that uses vbmeta_system.
Change-Id: I3bc526af3ec9f2680ca17ee5535607cff3ae9523
2019-05-06 12:56:52 -07:00
Jiyong Park
b8fca9280d Merge "Don't inherit updatable_apex from mainline_system"
am: 5e25df9f5a

Change-Id: Ib14e1439146fa2a07bec43bb87a2e2334b1be7ea
2019-05-06 10:22:54 -07:00
Treehugger Robot
5e25df9f5a Merge "Don't inherit updatable_apex from mainline_system" 2019-05-06 17:16:12 +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
Bo Hu
73c9f03b66 Merge "emulator: support dynamic partitions" 2019-05-06 15:21:19 +00: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
Jaewoong Jung
9c7c946176 Merge "Update hmm text for mgrep."
am: 21d0963839

Change-Id: I2a782cc7df8670002187d5eb50d72c3f125b37cc
2019-05-04 22:46:31 -07:00
Jaewoong Jung
21d0963839 Merge "Update hmm text for mgrep." 2019-05-05 05:36:01 +00:00
Jaewoong Jung
892d0fe1dd Update hmm text for mgrep.
mgrep also scans *.bp files.

Test: hmm
Change-Id: Ie7bf79d42958b269f4d2fb55d7728a22a52bf908
2019-05-04 10:06:28 -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
Tao Bao
6c4aa77c24 Merge "Ensure that 'release-keys' are set on properties"
am: cc389947d0

Change-Id: Id4882e7ee2c1522d4fdd00cbc90e7eb9e116b9b0
2019-05-03 14:27:54 -07:00
Tao Bao
cc389947d0 Merge "Ensure that 'release-keys' are set on properties" 2019-05-03 20:15:26 +00:00
Jiyong Park
9af722d59e Don't inherit updatable_apex from mainline_system
Camera on aosp_* targets are broken because they are inheriting from
updatable_apex.mk through mainline_system.mk. However, the kernels for
the targets on AOSP are too old to support updatable APEX. Temporarily
disabling updatable apex until when the kernels are updated from
internal master.

Bug: 131162245
Test: camera can be captured in aosp_crosshatch
Merged-In: Ibfef74db0769992266ebadf445836d2a183df3f7
Change-Id: Ia0beeb9523ade9bb8180034deb8ef0b01ee1c88b
2019-05-03 18:23:21 +00:00
Magnus Strandh
234f4b418f Ensure that 'release-keys' are set on properties
Some properties had 'test-keys' still set
after signing the target files zip for release.

These properties are now added to the RewriteProps
method.

Bug: 131810966
Test: manual
Test: `atest releasetools_test`
Change-Id: Ifb352ed28f5100f1e9f686d77e935723f7f6d3ae
2019-05-03 10:42:35 -07:00
Sasha Smundak
330928b3bd Merge "Provide android_app_certificate module that always points to AOSP certificate."
am: f14e865cfb

Change-Id: I0923430826024bd9824c1126997ecfe868eba171
2019-05-03 10:25:59 -07:00
Treehugger Robot
f14e865cfb Merge "Provide android_app_certificate module that always points to AOSP certificate." 2019-05-03 16:55:38 +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