Commit Graph

50411 Commits

Author SHA1 Message Date
Tao Bao 13ebc021ec releasetools: Update the comments regarding selinux_fc.
The former comment no longer applies, as we have been always packing
META/file_contexts.bin in a target_files.zip (commit aa7318c3, since
Nougat), and we no longer look for the one under BOOT/RAMDISK/ (commit
d14b8956, since Q).

Test: N/A
Change-Id: I03f361234bf440e942f21e5a624862590248544b
2019-05-08 12:40:27 -07:00
Dan Willemsen eb22c940ac Move BUILD_[HOST_]SHARED_TEST_LIBRARY to obsolete list
The implementation of these rules have been an $(error) for almost 3
years.

Test: treehugger
Change-Id: I2e258d297172532c0993c8cb8a2e19ad03ea281d
2019-05-08 12:37:10 -07:00
Dan Willemsen fd84a92b82 Deprecate next set of make module types
BUILD_AUX_EXECUTABLE
 BUILD_AUX_STATIC_LIBRARY

These shouldn't be used anymore, they were an intermediate state to
build some firmware that is no longer being built in Android.

 BUILD_HOST_FUZZ_TEST
 BUILD_HOST_NATIVE_TEST
 BUILD_HOST_STATIC_TEST_LIBRARY
 BUILD_NATIVE_BENCHMARK
 BUILD_STATIC_TEST_LIBRARY

There are no users of these left.

Bug: 130735607
Bug: 130735003
Bug: 130691889
Bug: 130723134
Bug: 130722660
Bug: 130734558
Bug: 130735594
Test: build_test & check logs
Change-Id: I8a9385040316495f7e7262d045be871e91712920
2019-05-08 12:27:53 -07:00
Tao Bao a2a708a616 Merge "Unset AB_OTA_UPDATER from BoardConfigMainlineCommon."
am: 246a30a1cb

Change-Id: If58241d1c5af2051f3bb40d503b5ee45c6a46b54
2019-05-08 11:52:14 -07:00
Tao Bao 246a30a1cb Merge "Unset AB_OTA_UPDATER from BoardConfigMainlineCommon." 2019-05-08 18:37:28 +00:00
Chris Gross e9425427c2 Merge "Add BUILD_RECOVERY_IMAGE and BUILD_BOOT_IMAGE flags"
am: 84c96eba1e

Change-Id: I66f4b0e3faaf3fcc16cd51a1e1f93d549fd708fd
2019-05-08 11:30:33 -07:00
Chris Gross 84c96eba1e Merge "Add BUILD_RECOVERY_IMAGE and BUILD_BOOT_IMAGE flags" 2019-05-08 18:21:42 +00:00
Hridya Valsaraju 1fd498d748 Move ro.boot.dynamic_partitions to vendor/build.prop
Bug: 132197773
Test: property present in vendor/build.prop

Currently, the property resides in product partition which gets
overwritten by the GSI image. Moving it to vendor will ensure
that the property is set even when a GSI image is flashed on the device.

Change-Id: I4d4a3c473194e15ba124a121f89bbb3ec1a73d19
2019-05-08 16:22:06 +00:00
Isaac Chen e9723507a1 Add PRODUCT_EXTRA_VNDK_VERSIONS product variables
PRODUCT_EXTRA_VNDK_VERSIONS should be in _product_list_vars
because it's used as a list with probably more than one version
included/set in differemt makefiles.

Bug: 132046980
Test: $ lunch aosp_x86_ab-userdebug
      $ m -j
      $ find $OUT/system/ -name vndk-* # vndk-27 directory is included

Change-Id: Iee9b7b678a23eed781cc761d820db9ff67ae5d34
2019-05-08 15:46:00 +08:00
Tao Bao 5fd2a085c3 Merge "Compute the needed shared libs for otatools."
am: 5eba1c9a67

Change-Id: I7a96636c6d61f0bed1d248c70eb7f58fb09a8ae6
2019-05-07 21:14:09 -07:00
Treehugger Robot 5eba1c9a67 Merge "Compute the needed shared libs for otatools." 2019-05-08 03:44:33 +00:00
Daniel Norman fd5091d06f Merge "Begins merging META/dynamic_partitions_info.txt."
am: 7eae467469

Change-Id: I77da9b31ab363c3c8cea338df6a2863e7cbf0526
2019-05-07 18:08:06 -07:00
Treehugger Robot 7eae467469 Merge "Begins merging META/dynamic_partitions_info.txt." 2019-05-08 01:00:32 +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
Treehugger Robot 96ba044c94 Merge "Use --ignore_missing_files when creating symbols.zip" 2019-05-07 21:32:54 +00:00
Tao Bao ff2a3f0af8 Unset AB_OTA_UPDATER from BoardConfigMainlineCommon.
The previous need to build mainline devices as A/B no longer applies
[1], as we have unbundled the install of update-payload-key.pub.pem from
AB_OTA_UPDATER. Unsetting AB_OTA_UPDATER from BoardConfigMainlineCommon
defers the decision of using A/B OTA to be board-specific.

mainline_arm64 is considered as a specific board to build generic
system-only OTAs in A/B format. So it defines the two variables there.

[1] commit 571fab0610

Bug: 130516531
Test: TreeHugger
Test: Compare the built images for GSI and mainline targets. They don't
      have different artifacts due to the change.
Change-Id: I33cc9b6623dca7cc7c2a7e2c65cdbccced5e816e
2019-05-07 13:26:09 -07:00
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