Commit graph

54840 commits

Author SHA1 Message Date
Daniel Mentz
1e8961033e Merge "Consider search_path to locate avb_*_key_path files"
am: 11dc247ba9

Change-Id: Ie0479fe88e37b330bc80fb6cb68d906546c70b0a
2019-08-26 12:21:24 -07:00
Xin Li
11f4327038 DO NOT MERGE - Skip build QP1A.190711.020 in stage-aosp-master
Bug: 139893257
Change-Id: I2a5aab8575c187db85ed6197160779886ddd4340
2019-08-26 18:31:31 +00:00
Daniel Mentz
11dc247ba9 Merge "Consider search_path to locate avb_*_key_path files" 2019-08-26 18:17:29 +00:00
Daniel Mentz
25478181b9 Consider search_path to locate avb_*_key_path files
avb_*_key_path are usually relative file paths. If these files cannot be
located from the current directory, try prepending OPTIONS.search_path.

Bug: 139836256
Test: python -m unittest test_common
Test: python -m unittest test_add_img_to_target_files
Change-Id: I020b257f458a1f5762691d0499feaf4027e37126
2019-08-26 18:17:14 +00:00
Mathieu Chartier
066f23b78a Merge "Revamp nopreload configuration"
am: bca3111cfa

Change-Id: I7f37c8fe0d97d2b8af44a0b11340480c156d2ac2
2019-08-26 09:27:02 -07:00
Mathieu Chartier
bca3111cfa Merge "Revamp nopreload configuration" 2019-08-26 16:13:10 +00:00
Baligh Uddin
6fac8bab91 Merge "Add a guard against deleting AVB_PUBKey."
am: 667c1aa83d

Change-Id: I255c746b3f6c8b98787f157800d143523c82161f
2019-08-25 22:16:58 -07:00
Baligh Uddin
667c1aa83d Merge "Add a guard against deleting AVB_PUBKey." 2019-08-26 05:04:46 +00:00
Baligh Uddin
15881282d7 Add a guard against deleting AVB_PUBKey.
The avb_pubkey may not be present, if the apex was initially
unsigned or generated from a bundle.  In this case, running
sign_apex to generate a signed apex binary would result in an error.
This fix checks for presense of avbpubkey before attempting the
deletion

BUG: 139994107
Change-Id: I3cb2e88a11ad8797e38ba5fb98c96a4ec4135fc8
2019-08-25 22:01:45 -07:00
TreeHugger Robot
3db69e3a80 Merge "DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master" into stage-aosp-master 2019-08-24 06:48:48 +00:00
Amy Zhang
2491b3ca91 Merge "Tuner Hal 1.0 to build Add Tuner Hal 1.0 entry to configure file for building Test: Manual bug: 135709729"
am: e7f5833792

Change-Id: I0ffa402138e9097f5b984d3358a318a8c7ee9e84
2019-08-23 21:17:27 -07:00
Mathieu Chartier
7aa4e8614a Revamp nopreload configuration
No longer speed compile, we will rely on JIT and compilation during
boot to ensure performance.

Removed system ROM instrumentations since this will be done
dynamically.

Fixed renamed profilebootclasspath property.

Test: lunch taimen_nopreload-userdebug
Exempt-From-Owner-Approval: cherry-pick
Bug: 139883463

(cherry picked from commit 6f8fda4937)

Merged-In: I97a3a25c3094f84e130e02692b02832795ee6ef1
Change-Id: Id3e9b30a60d00ad3593f1587aa4b04ef7afe1fec
2019-08-23 22:09:02 +00:00
Amy Zhang
e7f5833792 Merge "Tuner Hal 1.0 to build Add Tuner Hal 1.0 entry to configure file for building Test: Manual bug: 135709729" 2019-08-23 22:02:59 +00:00
TreeHugger Robot
7887a5010d Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master 2019-08-23 20:27:14 +00:00
Elliott Hughes
21e1dba28b Merge "macOS calls itself Darwin."
am: 33dfa52cdd

Change-Id: Ia00d0001106daaecf6b3a4b9b377c1663fd31bd9
2019-08-23 10:10:12 -07:00
Treehugger Robot
33dfa52cdd Merge "macOS calls itself Darwin." 2019-08-23 16:45:07 +00:00
Isaac Chen
5c40e0b628 Merge "Include misc_info.txt for super.img in dist"
am: da8bf47e68

Change-Id: I2982e396ffbf01c5cbed949773a68afa2b65c090
2019-08-23 00:58:36 -07:00
Isaac Chen
da8bf47e68 Merge "Include misc_info.txt for super.img in dist" 2019-08-23 07:35:52 +00:00
Xin Li
8bd576e201 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: If694d0bc707fe5b9d21f9de1b5846ab9f2096042
2019-08-23 06:48:52 +00:00
Xin Li
7b4f1048e1 DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
Bug: 139893257
Change-Id: If9ddcdd788d1cdfb1d19d2dc0d5d9b09fa9377b8
2019-08-23 06:42:01 +00:00
Henry Fang
ab23894a4a Tuner Hal 1.0 to build
Add Tuner Hal 1.0 entry to configure file for building
Test: Manual
bug: 135709729

Change-Id: I6c8fa9382c64dc86f719fdfb17726fa694b6abb7
Merged-In: I6c8fa9382c64dc86f719fdfb17726fa694b6abb7
2019-08-23 00:47:54 +00:00
Xianyuan Jia
41862d9ba4 Add iperf3 to debug packages
Bug: 123261826
Test: manual build
Change-Id: Ia7639daccd8ec9e48dbc1e900669c821f73a8be7
2019-08-22 22:54:12 +00:00
Elliott Hughes
a8368efe51 macOS calls itself Darwin.
Test: uname
Change-Id: Id3ce8614869e68c15666051af14321f597d6ae0f
2019-08-22 13:38:28 -07:00
Tom Cherry
6215e436f3 Fix host-init-verifier regression
After the split up of prebuilt_internal.mk, the logic for running
host-init-verifier on init.rc files was misplaced.  This change moves
it back to the right location.

Test: see that a mistake in rootdir/init.rc causes the build to fail
Change-Id: I60e503cc48639f4f11c47e6636f140672fde61b4
2019-08-22 10:47:16 -07:00
Anton Hansson
7e274918c0 [automerger skipped] Merge "Remove stale artifact whitelist entries"
am: ffdeeae450 -s ours
am skip reason: change_id Ia495ed7b883fd100fdb75206c13cedb6fa62b0b2 with SHA1 5f7c08fbb3 is in history

Change-Id: I9c8554dabeffb02849b781e8efde6624a55b9e2d
2019-08-22 05:22:44 -07:00
Anton Hansson
ffdeeae450 Merge "Remove stale artifact whitelist entries" 2019-08-22 12:09:27 +00:00
Anton Hansson
1ce08094d3 Merge "Remove stale artifact whitelist entries" into stage-aosp-master 2019-08-22 10:59:22 +00:00
Dan Willemsen
86be07669f Merge "Remove package-stats.txt"
am: 1211130c92

Change-Id: I6be259692a3a25934f30595b7f23177c4f6b62bb
2019-08-21 23:51:21 -07:00
Treehugger Robot
1211130c92 Merge "Remove package-stats.txt" 2019-08-22 06:40:11 +00:00
Isaac Chen
52cc60ca15 Include misc_info.txt for super.img in dist
Include the misc_info.txt in "dist_files" so we can recreate a new
mixed super image (system and vendor images from different builds)
later in the test pipeline.

The misc_info.txt for products with BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE
set to true is removed from their update packages (essentially, reverts
aosp/976069) since the super_misc_info.txt created here can be used.

Bug: 139404128
Test: $ lunch aosp_x86-userdebug
      $ m dist
      $ diff $OUT_DIR/dist/super_misc_info.txt $OUT/misc_info.txt

Change-Id: Iad1ff981124a19933b0b575bc99941e0fc3813a7
2019-08-22 13:22:06 +08:00
Jeongik Cha
5f1eca2482 Merge "SYSTEM_EXT supports executables"
am: 6d52157f9d

Change-Id: I895dec8ff661e914fe35bc20e6a1ab1762037f9b
2019-08-21 18:31:10 -07:00
Treehugger Robot
6d52157f9d Merge "SYSTEM_EXT supports executables" 2019-08-22 01:07:20 +00:00
Jeff Sharkey
1d7c658611 Merge "Add "owngrep" shell utility."
am: fc587b926d

Change-Id: Ic3f94e08afadfb346cc032950996be2406ceacdf
2019-08-21 17:41:33 -07:00
Dan Albert
68e9a68014 Merge "Link libc++demangle with libc++ for the device."
am: 400c218219

Change-Id: I3f736121bf894a57a6d066672fb8a61d08adbce5
2019-08-21 17:25:35 -07:00
Peter Collingbourne
074651ba13 Merge "Only include the "tools" and "testcases" subdirectories in android-cts.zip."
am: 0f9ac40dd6

Change-Id: Iccd2f3cbcad562a0fa7a089cb48f10db1ace7177
2019-08-21 17:24:25 -07:00
Jeff Sharkey
fc587b926d Merge "Add "owngrep" shell utility." 2019-08-22 00:02:02 +00:00
Treehugger Robot
400c218219 Merge "Link libc++demangle with libc++ for the device." 2019-08-21 23:54:48 +00:00
Treehugger Robot
0f9ac40dd6 Merge "Only include the "tools" and "testcases" subdirectories in android-cts.zip." 2019-08-21 23:45:47 +00:00
Roland Levillain
0a416ce07e Merge "Rename Soong variable FlattenApex as Flatten_apex."
am: 57b8a7cf66

Change-Id: I0ace2508ef1e9676073b808e10310a0d45694d4c
2019-08-21 13:13:46 -07:00
Tom Cherry
e3fa048c10 Merge "Add group_system_ext and passwd_system_ext"
am: e6012c8826

Change-Id: Ib8d0e502fba999796cd24fbc6e065fea328547a2
2019-08-21 13:12:40 -07:00
Jeff Sharkey
f17cddfa5b Add "owngrep" shell utility.
Bug: 132612223
Test: manual
Change-Id: Ibe27e419caaf4ebcbb5d48ab50cc71730c320e1c
2019-08-21 13:55:52 -06:00
Roland Levillain
57b8a7cf66 Merge "Rename Soong variable FlattenApex as Flatten_apex." 2019-08-21 19:55:47 +00:00
Dan Willemsen
d7994816c1 Remove package-stats.txt
I can't find any remaining users of this functionality.

Test: codesearch; treehugger
Change-Id: I63b079b381211b743baa293267c992d9b2eadcf9
2019-08-21 12:36:14 -07:00
Peter Collingbourne
bbddfcf7ba Only include the "tools" and "testcases" subdirectories in android-cts.zip.
Without this, we can end up packaging log files from previous CTS runs in
the zip file. If the names of those log files contain whitespace characters,
it can result in a build failure.

Change-Id: Id96d1915a03b6a715acfdc212c9b2d6f28045baa
2019-08-21 12:31:41 -07:00
Tom Cherry
e6012c8826 Merge "Add group_system_ext and passwd_system_ext" 2019-08-21 19:19:23 +00:00
Tom Cherry
9f8d4eba01 Add group_system_ext and passwd_system_ext
Add the remaining group and passwd files for partitions that have
reserved AIDs.

Test: mainline checks pass
Change-Id: Iae62c9465e0144b77b1d804c17fe6e724a744da2
2019-08-21 08:16:16 -07:00
Tianjie Xu
d4400ca15f Merge "Generate block based OTA for product partitions"
am: 2211352eed

Change-Id: Ib36f9dde2982d77fdd2a8a74d2e80d7a8b21326e
2019-08-20 13:39:52 -07:00
Tianjie Xu
2211352eed Merge "Generate block based OTA for product partitions" 2019-08-20 20:01:33 +00:00
Jeongik Cha
9478f66632 Turn on BOARD_USES_METADATA_PARTITION in mainline
All the targets that inherit mainline seem to use metadata_partition,
So turn on BOARD_USES_METADATA_PARTITION

Bug: 137920314
Bug: 139731063
Test: m && check if there is /metadata
Change-Id: I17cfb5faf76a3c3d6ce1be594274ea58ebc1d1ae
2019-08-20 14:26:11 +00:00
Anton Hansson
5f7c08fbb3 Remove stale artifact whitelist entries
Test: lunch mainline_arm64; m nothing
Change-Id: Ia495ed7b883fd100fdb75206c13cedb6fa62b0b2
2019-08-20 12:17:06 +01:00