Commit Graph

52506 Commits

Author SHA1 Message Date
Baligh Uddin
f518748b2b DO NOT MERGE - Add a guard against deleting AVB_PUBKey.
am: 39b8f9fc7d

Change-Id: Ic1f496af3c6f58a2d0aaf41244c59a22eb927d93
2019-08-26 16:59:25 -07:00
Baligh Uddin
39b8f9fc7d DO NOT MERGE - 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:20:36 -07:00
Paul Scovanner
cc0234ba55 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours am: e840881168
am: b575bd5e24

Change-Id: I7d6d992265898dd27dbc4e0cf82cfd49479f56ed
2019-08-15 18:06:28 -07:00
Paul Scovanner
b575bd5e24 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01 am: 3250cbd459 -s ours
am: e840881168

Change-Id: If3950a62061e980ca8418d2c3057663c05b7fdf2
2019-08-15 17:48:20 -07:00
Paul Scovanner
e840881168 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01
am: 3250cbd459 -s ours
am skip reason: subject contains skip directive

Change-Id: Icabb27f1fbad9a61104dd9a8421a5c87d1c18b64
2019-08-15 17:35:19 -07:00
Paul Scovanner
3250cbd459 [DO NOT MERGE] Update Security Strings to 2019-10-01
Bug:139434268
Change-Id: Ie9e36ac0ace5c67468391650ad2fa1fa02941f6e
2019-08-15 02:52:20 +00:00
Paul Scovanner
d77b00d4d0 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540
am: 5140669795

Change-Id: Ic177165f28fa6bf7f1f1b3773c95959204dfef8f
2019-08-14 19:35:54 -07:00
Paul Scovanner
50fa3d0d19 Update Security Strings to 2019-10-05 am: 84633edb22
am: e1d53f95a2

Change-Id: I87545a0d1ffdb20306641799a7def47b4b602508
2019-08-14 19:35:17 -07:00
Paul Scovanner
5140669795 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours
am: 616d794540

Change-Id: I6464a4f9286fd3fafe1c5f5ca3f0766913dc98c2
2019-08-14 19:26:50 -07:00
Paul Scovanner
e1d53f95a2 Update Security Strings to 2019-10-05
am: 84633edb22

Change-Id: I360a2512006317b0999586a5567b0bf370ee120b
2019-08-14 19:26:11 -07:00
Paul Scovanner
616d794540 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01
am: b88c9853aa -s ours
am skip reason: subject contains skip directive

Change-Id: I9454feb6965bf8a9e56342a3f8348d5933ece914
2019-08-14 19:24:52 -07:00
Paul Scovanner
b88c9853aa [DO NOT MERGE] Update Security Strings to 2019-09-01
Bug:139434268
Change-Id: I802a7aeb0c65240ff71f91506b8932bfa44090bc
2019-08-14 22:17:07 +00:00
Paul Scovanner
84633edb22 Update Security Strings to 2019-10-05
Bug:139434268
Change-Id: I063f0430347d9f1e6ea5a8133204585833ed5ddc
2019-08-14 21:11:01 +00:00
Colin Cross
475f9218fd DO NOT MERGE - temporarily disable vendor file check for mainline
am: c41a28cb1c

Change-Id: I122f3698367ca759c74cf0cbd402ebf6aa406936
2019-08-09 10:30:30 -07:00
Colin Cross
c41a28cb1c DO NOT MERGE - temporarily disable vendor file check for mainline
We want to use prebuilts for apex modules for qt-*-dev, but it is
running afoul of the vendor file check.  Disable the check for
now until we figure out a better solution.

Bug: 136664286
Test: Local build and Forrest Run
Change-Id: I9db5cb227780ede6aaff0070cd2fd59e95e635e6
2019-08-07 07:00:06 -07:00
Eino-Ville Talvala
f7aa39490f Merge "Remove libcameraservice and libcamera_client from base_system" into qt-r1-dev
am: 6f6d78bace

Change-Id: Ib3766e4ca747f8e4c4e57d513982d20d9bc2cbb1
2019-07-30 17:14:28 -07:00
TreeHugger Robot
6f6d78bace Merge "Remove libcameraservice and libcamera_client from base_system" into qt-r1-dev 2019-07-30 23:23:41 +00:00
Baligh Uddin
3e4bd7191c Select all .pem and .avbpubkey in otatools am: df238b4e41
am: c59ebf9990

Change-Id: I880aba02f73155bb73bf10961a6f65e099454190
2019-07-30 07:08:40 -07:00
Baligh Uddin
c59ebf9990 Select all .pem and .avbpubkey in otatools
am: df238b4e41

Change-Id: I66d5e2e8d389d76134e8a629847c441019d049d5
2019-07-30 06:57:37 -07:00
Baligh Uddin
df238b4e41 Select all .pem and .avbpubkey in otatools
Apex payload dev keys are stored as .pem files.
Apex payload also utilizes .avbpubkey as public keys.

Change-Id: I65ced74be02008b666d7bb608f0d0a3ef3769c9c
BUG: 138623265
2019-07-29 21:35:05 -07:00
Eino-Ville Talvala
976b1e2df9 Remove libcameraservice and libcamera_client from base_system
Libcameraservice is only used by cameraserver, and is explicitly listed
as a dependency.  Libcamera_client is used by multiple places, but each
of them lists it as a depedency as well, so it's not needed here.

Removing the unused 64-bit version of libcameraservice will save ~2 MB
on the system partition.

Bug: 138403869
Test: atest CtsCameraTestCases
Merged-In: I196f869350900e7cc1521bc397c6ecff28decb6f
Change-Id: I196f869350900e7cc1521bc397c6ecff28decb6f
2019-07-26 12:54:44 -07:00
Isaac Chen
9008e80c8e Merge "Disable apex update for GSI" into qt-dev
am: 66893b698c

Change-Id: I144b524967844a6ac908e071571892ea790ad4ef
2019-07-16 20:46:15 -07:00
TreeHugger Robot
66893b698c Merge "Disable apex update for GSI" into qt-dev 2019-07-17 03:23:16 +00:00
Dan Shi
419c655ffb Update auto-gen test config template with EXTRA_CONFIGS placeholder
am: 8d5459fc6d

Change-Id: I2066d20b3f3d22a208993b2f1cecb404c6fd6a04
2019-07-15 11:04:15 -07:00
Dan Shi
8d5459fc6d Update auto-gen test config template with EXTRA_CONFIGS placeholder
Bug: 134509111
Bug: 136633978
Test: add "require_root: true" to init_benchmarks and libpower_test
build the modules, confirm the extra target preparer is added in the
test config.

Change-Id: I2fdae79d45fd1e5866ee94d1f0e59df106be2a87
Merged-In: I2fdae79d45fd1e5866ee94d1f0e59df106be2a87
2019-07-15 17:29:42 +00:00
Chen Zhu
450cfe25fb Merge "Add Mainline Test Suite (MTS) to build." into qt-dev
am: 3538cebfc7

Change-Id: Id473d4fb2f8cadba9019bfe84850d6ada355fcd8
2019-07-12 11:34:15 -07:00
Chen Zhu
3538cebfc7 Merge "Add Mainline Test Suite (MTS) to build." into qt-dev 2019-07-12 18:05:00 +00:00
Elisa Pascual Trevino
f7895970b1 Merge "Update Security String to 2019-09-05 Bug: 137199979" into qt-dev
am: 61920cbf99

Change-Id: I190716ebc98dac267c38db9159c3d59b15dc5548
2019-07-11 20:50:53 -07:00
TreeHugger Robot
61920cbf99 Merge "Update Security String to 2019-09-05 Bug: 137199979" into qt-dev 2019-07-12 03:26:43 +00:00
Tao Bao
154a6a624d Merge "releasetools: Ignore nonexistent APEX overrides." into qt-dev
am: a6935cc16a

Change-Id: If138057ea1ebd966a1a83baa8366ee1d0edcb9ed
2019-07-11 16:30:37 -07:00
TreeHugger Robot
a6935cc16a Merge "releasetools: Ignore nonexistent APEX overrides." into qt-dev 2019-07-11 23:03:00 +00:00
Elisa Pascual Trevino
6e1f7a0893 Update Security String to 2019-09-01 Bug: 137199979
am: 4364982766

Change-Id: Ie653d3637e0560b7d4d9493fe7691fe35b96db76
2019-07-11 15:43:21 -07:00
Elisa Pascual Trevino
ac6e24e5b1 Update Security String to 2019-09-05
Bug: 137199979
2019-07-11 22:26:27 +00:00
Elisa Pascual Trevino
4364982766 Update Security String to 2019-09-01
Bug: 137199979
2019-07-11 22:20:00 +00:00
Tao Bao
b369c7226a releasetools: Ignore nonexistent APEX overrides.
This allows sharing the same signing config on different target_files
zips. Nonexistent APEX will be ignored with a warning.

Bug: 137249701
Test: Run sign_target_files_apks with APEX overrides.
Change-Id: I2bad0f5c00753ed36ec5ae3431c7dc2ff1fc3e9c
2019-07-11 11:54:39 -07:00
Colin Cross
d50bca3422 [automerger skipped] temporarily disable vendor file check for mainline
am: 3f8eb7ec99 -s ours
am skip reason: change_id I99431a9a342e9b0617510e250597f3024ef39322 with SHA1 ef212270fe is in history

Change-Id: I0c73532829c8272105b8ff96e7e91632f39194f1
2019-07-09 20:15:19 -07:00
Colin Cross
3f8eb7ec99 temporarily disable vendor file check for mainline
We want to use prebuilts for apex modules for qt-dev, but it is
running afoul of the vendor file check.  Disable the check for
now until we figure out a better solution.

Using Merged-In instead of DNM

Bug: 137033385
Test: Forrest run build_test
Change-Id: I9db5cb227780ede6aaff0070cd2fd59e95e635e6
Merged-In: 874b7a7766a569613dcd3ae526eaa6e1d4b78866
Merged-In: I99431a9a342e9b0617510e250597f3024ef39322
2019-07-09 15:36:28 -07:00
Andrew Chant
96a3386b23 Catch unicode decode errors search for kernel ver
If attempting to decompress a kernel produces
non-ascii bytes, catch the decoding error when
searching for the kernel version.

Bug: 137041171
Change-Id: Ic035b3a5c8c80025cb3cede7b0fdcf8a2e5a35fd
2019-07-09 02:20:43 +00:00
Justin Yun
cc0cb3f418 Do not allow building product_services image
am: 25065c44cc

Change-Id: Ia3c9468f9f659425969462b7f987d7d913e59cea
2019-07-07 16:37:32 -07:00
SzuWei Lin
2056544be7 Add default LMK properties to GSI
am: 9547929af4

Change-Id: I2295e592fb124b081ef0fdd6ad5db3ff61f2afe9
2019-07-05 07:29:18 -07:00
Justin Yun
25065c44cc Do not allow building product_services image
product_services partition is designed for the test purpose only. It
must not be included in the target devices.

Bug: 134359158
Test: Build configuration for product_services partition must return
      error message.

Change-Id: I6f8cdf73d18ad3174c7b31edb5d5ee10df75a776
2019-07-05 20:38:01 +09:00
SzuWei Lin
9547929af4 Add default LMK properties to GSI
These LMK properties are product properties. The configuration will
be absent when GSI is installed as GSI doesn't mount the product
partition. Without these settings, some CTS test cases could
fail due to an aggressive LMK.

The patch puts these properties in GSI as default values.

Bug: 136212765
Bug: 134460917
Test: `run cts -m CtsFileSystemTestCases`, all pass
Change-Id: I6fde8db51debcb9bb269aece3a3e4c7e5bb991f6
2019-07-03 17:59:03 +08:00
Tao Bao
06429d7048 Change the condition for building super_empty.img.
This CL changes the condition for building super_empty.img from
PRODUCT_BUILD_SUPER_PARTITION to PRODUCT_USE_DYNAMIC_PARTITIONS, as a
follow-up to the change in [1].

With the CL in [1], it skips building super.img and super_empty.img both
when turning off PRODUCT_BUILD_SUPER_PARTITION. However, the latter
should be mandatory whenever dynamic partitions is enabled. Because
fastboot relies on this file to properly flash dynamic partitions. Plus,
the cost for building super_empty.img is much lower than the one for
super.img.

As part of the change, it'll write group info into target_files when
building with PRODUCT_BUILD_SUPER_PARTITION == false. It's the work for
target_files merging script to determine the values to be picked up. The
current logic in merge_target_files.py always uses the one from vendor
target_files. This CL adds a testcase to ensure the behavior.

[1] https://android-review.googlesource.com/c/platform/build/+/928756

Bug: 135752763
Test: `m dist` with a target that sets PRODUCT_BUILD_SUPER_PARTITION to
      false. Check the built artifacts contain super_empty.img. Verify
      that the build can be flashed properly.

Change-Id: I277f087eab45663a6c3b33333d16e9e576c1c25c
Merged-In: I277f087eab45663a6c3b33333d16e9e576c1c25c
(cherry picked from commit 48a2feb670)
2019-07-02 03:30:17 +00:00
Daniel Norman
ef212270fe Allows skipping building the super images for partial builds.
Previously, setting PRODUCT_BUILD_SUPER_PARTITION to false for a partial
build (with PRODUCT_USE_DYNAMIC_PARTITIONS == true) would fail to
include necessary keys in misc_info.txt that are required when merging
two partial builds to create a dynamic-partition-enabled mixed build.

This change ensures these necessary keys are included even when
PRODUCT_BUILD_SUPER_PARTITION is false. Setting
PRODUCT_BUILD_SUPER_PARTITION to false causes partial builds to skip
building super.img and super_empty.img, instead relying on these images
to come from the final merged build.

Bug: 135752763
Bug: 134764140
Test: Building & booting a dynamic-partition-enabled mixed build, and
inspecting partial builds' logs / out folder to ensure that
super.img/super_empty.img were not created.

Change-Id: I99431a9a342e9b0617510e250597f3024ef39322
Merged-In: I99431a9a342e9b0617510e250597f3024ef39322
(cherry picked from commit 0bf940cace)
2019-07-01 15:19:22 -07:00
Anton Hansson
2e73d20c0b Remove lmk.log_stats sysprop from mainline_system
am: d8d0821252

Change-Id: I346f5c0f222c138b7505196b4e8892e22adb5c62
2019-06-27 18:15:32 -07:00
Anton Hansson
d8d0821252 Remove lmk.log_stats sysprop from mainline_system
It is now set on the /product partition by relevant devices.

Bug: 135569569
Test: lunch mainline_system_arm64; inspect system/etc/prop.default
Test: boot crosshatch and check the sysprop is still true via "adb shell getprop"
Change-Id: I34696977f584a65741c6002e6688d86e66a1f121
Merged-In: I34696977f584a65741c6002e6688d86e66a1f121
2019-06-27 10:32:46 +00:00
SzuWei Lin
066b374c54 Enforce property split in GSI
am: e40cc936ff

Change-Id: If482b8f75598df9a675b343b2a92d894ebf0c1b7
2019-06-21 08:07:40 -07:00
Isaac Chen
9550ce161f Disable apex update for GSI
Currently, GSI does not include apex support and TARGET_FLATTEN_APEX is true.
This will cause issues for vendors with apex support (e.g. Cuttlefish).
This change set ro.apex.updatable to false in product to override that sets
in vendor.

Bug: 135411972
Bug: 134673003
Test: $ lunch aosp_x86-userdebug; m -j; emulator
      $ lunch aosp_cf_x86_phone-userdebug
      # Replace system.img in super.img with GSI
      # The resulted CF could boot and browse the web successfully.

Change-Id: I08fd7a1b254aac276926329e064c35b714764936
Merged-In: I08fd7a1b254aac276926329e064c35b714764936
(cherry picked from commit fae280264e)
2019-06-21 00:36:42 +00:00
SzuWei Lin
e40cc936ff Enforce property split in GSI
Pure GSI build targets has no vendor partition, such as
aosp_$arch_ab and gsi_$arch. The system properties defined by
PRODUCT_PROPERTY_OVERRIDES will be in /system/build.prop.

The patch defined a fake BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE to
let these system properties flow to vendor and won't pollute the
system.img.

The bug also move some properties to /product/build.prop.

Bug: 135508595
Bug: 131162245
Bug: 134781120
Test: check the /system/build.prop do not have "ro.carrier=unknown"
Test: adb remount on GSI Q on P
Change-Id: Ib200d66cf98fea572c26338e058bce29eb5e0cd7
Merged-In: Ib200d66cf98fea572c26338e058bce29eb5e0cd7
(cherry picked from commit 711d696eb3af759c63c416b0224faeac1f6c04f1)
2019-06-21 00:35:45 +00:00
Chen Zhu
ce72964fa1 Add Mainline Test Suite (MTS) to build.
Test: m mts

Bug: 126277867
Bug: 123411735
Change-Id: Iba6bf89bd4457ed0f5c1eb3351bf5ffd6720441d
2019-06-19 15:14:23 -07:00