Commit Graph

49267 Commits

Author SHA1 Message Date
Treehugger Robot 96ba044c94 Merge "Use --ignore_missing_files when creating symbols.zip" 2019-05-07 21:32:54 +00: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
Bill Peckham 7dbbc3075b Merge "Use file_contexts.bin from other build to regenerate images." 2019-05-07 17:26:25 +00: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 32d69c6b74 Merge "releasetools: Support replacing the signing keys for chained vbmeta." 2019-05-07 03:10:35 +00: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
Treehugger Robot 5e25df9f5a Merge "Don't inherit updatable_apex from mainline_system" 2019-05-06 17:16:12 +00:00
Tao Bao 59c700154b Merge "Remove unused shared libs from otatools." 2019-05-06 16:32:25 +00: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 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
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
Treehugger Robot 37eadacc20 Merge "Enable native_bridge" 2019-05-03 22:23:00 +00:00
Colin Cross 7c485728cf Merge "Remove reverse-list from java static libraries." 2019-05-03 21:31:47 +00: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
Treehugger Robot f14e865cfb Merge "Provide android_app_certificate module that always points to AOSP certificate." 2019-05-03 16:55:38 +00: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 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
Sasha Smundak f222dfbb0c Provide android_app_certificate module that always points to AOSP
certificate.

See the comment in cts/tests/tests/carrierapi/Android.bp

Bug: 122332514
Test: atest CtsCarrierApiTestCases
(same failures as baseline)
Change-Id: I80b9a1e466a3556486d05befe60d3522e6980ef5
2019-05-02 22:22:47 -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
Treehugger Robot 1c5610915f Merge "BUILD_(HOST|TARGET)_TEST_CONFIG errors by default" 2019-05-03 00:47:09 +00: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 c23e013814 Merge "Rename PRODUCT_USES_ART to PRODUCT_USES_DEFAULT_ART_CONFIG" 2019-05-02 17:56:11 +00:00
Treehugger Robot ad52781bdc Merge "allow actually 140MB vendor partition space" 2019-05-02 16:16:41 +00:00
Tao Bao 65e41c4236 Merge "releasetools: Skip on empty care_map." 2019-05-02 15:35:55 +00:00
Lajos Molnar bf77eecd3d allow actually 140MB vendor partition space
Bug: 129710438
Change-Id: I93bfe7f25f16a8e48871db7357ec587c21dcc7d6
Merged-In: I93bfe7f25f16a8e48871db7357ec587c21dcc7d6
2019-05-02 15:18:33 +00:00
Martin Stjernholm a6dc671385 Merge "Add libs that have been resolved to the library absence check." 2019-05-02 14:05:46 +00: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
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 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 a2488b7d85 Merge "Add BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE flag." 2019-04-30 19:49:12 +00:00
Treehugger Robot ab0ed975f0 Merge "Removing --flag 2 when building GSI vbmeta.img" 2019-04-30 08:06:34 +00:00