Commit graph

52258 commits

Author SHA1 Message Date
TreeHugger Robot
f9dca5e1d8 Merge "Convert oemaids_headers / passwd / group to Soong" into qt-dev 2019-04-12 16:06:59 +00:00
Anton Hansson
a7d290cbad Merge "Add libdrm to mainline_system" into qt-dev 2019-04-12 10:54:57 +00:00
Tianjie Xu
cd797a289f Merge "Pass the correct signature size to payload generator" into qt-dev 2019-04-12 01:21:45 +00:00
TreeHugger Robot
ec5b536446 Merge "DO NOT MERGE BUILD_ID=QT" into qt-dev 2019-04-12 00:41:32 +00:00
Dan Willemsen
b9d45c7d47 Convert oemaids_headers / passwd / group to Soong
Bug: 118089258
Test: m oemaids_header_gen oemaids_headers passwd group
Change-Id: Ie3b92a499b44391e0692da5d9ad067089a62aabb
Merged-In: Ie3b92a499b44391e0692da5d9ad067089a62aabb
(cherry picked from commit d32e6d1314)
2019-04-11 16:41:22 -07:00
Ian Pedowitz
6136d945b3 DO NOT MERGE BUILD_ID=QT
Bug: 128934651
Change-Id: Icad27eb43a782c6bf97e78076a365b0d31aefd54
2019-04-11 15:55:57 -07:00
TreeHugger Robot
c028b0e155 Merge "docker: update sha256sum for repo version 1.25" into qt-dev 2019-04-11 21:52:23 +00:00
xunchang
3c5de18f5d Pass the correct signature size to payload generator
The signature size will be 512 bytes when signing the payload
with 4096 bits key. This cl determines the key size with
"openssl rsa -modulus"

The new key in testdata is generated by
"openssl genrsa -out testkey 4096"

Bug: 129163830
Test: generate and verify an OTA package
Change-Id: I6662b0a0c553dc0fd84711312a1256b887e332fd
(cherry picked from commit 376cc7c452)
2019-04-11 21:04:28 +00:00
Pavel Salomatov
a77dea9865 docker: update sha256sum for repo version 1.25
Fixes: 130366091
Change-Id: Iaec4b2429c61aa2d804e56a88cf66ae543a29805
Merged-In: Iaec4b2429c61aa2d804e56a88cf66ae543a29805
(cherry picked from commit 4a7f6daa85)
2019-04-11 13:38:05 -07:00
Yifan Hong
0d8e89b5f8 Reland "Only assert-max-image-size for static partitions."
assert-max-image-size doesn't make sense for
dynamic partitions, as build_image.py always find the
right size for the output image. Hence:

- build_image.py no longer need to write generated_*_info.txt
  (which contains the size of the image).
- assert-max-image-size on the static BOARD_*IMAGE_PARTITION_SIZE. If
  a partition is dynamic, that variable isn't set, and
  assert-max-image-size becomes a no-op. If the partition is static,
  assert-max-image-size checks the static partition size as it used
  to be.
- Fix read-size-of-partitions to use the size of the partition by
  reading the image directly (instead of using generated_*_info.txt).

For devices without AVB, with DAP enabled, and does not have
RESERVED_SIZE for partitions, because of right sizing, the original
code always warns about approaching size limits. Since such checks
doesn't make sense for dynamic partitions, remove them.

Test: builds on device with dynamic partitions
Test: builds on cuttlefish with DAP enabled (without AVB), no
      more size limit warnings:
WARNING: out/target/product/vsoc_x86/vendor.img approaching size limit (X now; limit X)

This reverts commit 6e099095d1.

Reason for revert: reland the CL

Bug: 122377935
Test: build blueline_mainline

Change-Id: Iee594b64e687decff186c0fa60f82b88608febe9
Merged-In: Iee594b64e687decff186c0fa60f82b88608febe9
2019-04-11 10:12:27 -07:00
Yifan Hong
cf9f9bedb8 sparse_img.py --get_partition_size return size of partition
Also, move code from build_super_image.py to sparse_img.py.

Test: sparse_img.py on sparse and non-sparse images
Bug: 122377935
Change-Id: Ie91fdfdbb54298ea27eb20d1b5363aeb1470356e
Merged-In: Ie91fdfdbb54298ea27eb20d1b5363aeb1470356e
2019-04-11 10:12:27 -07:00
Yifan Hong
c5aae579b7 Revert "Fix dynamic partition size check for devices with recovery"
Reason for revert: size check is removed for devices
with dynamic partitions because it doesn't make sense.

Bug: 122377935
Bug: 120043292
Bug: 124489494
Test: build cuttlefish

This reverts commit accf09b2e0.

Change-Id: I289faf11a08acbcef36924eb747a15f55124ce79
Merged-In: I289faf11a08acbcef36924eb747a15f55124ce79
2019-04-11 10:12:27 -07:00
Anton Hansson
92c66b3daa Add libdrm to mainline_system
Used by things on /product.

Bug: 130023865
Test: make
Change-Id: I564c6d823ac7e04d6a41dfd1ceb7074755b0bfd8
2019-04-11 17:00:24 +01:00
Dan Willemsen
5606d2b53b Split ALL_MODULES.*.REQUIRED and friends between target/host
So that we actually respect different LOCAL_REQUIRED_MODULES for the
host and device versions instead of unioning them. That got particularly
problematic when LOCAL_SHARED_LIBRARIES is implicitly added to
LOCAL_REQUIRED_MODULES. We also used to walk through device-only modules
when filling out the list of required modules, which triggered even more
extra installations.

This also changes the requirements for PRODUCT_HOST_PACKAGES so that it
no longer accepts target-only phony modules (since we can now
differentiate them). They were all removed in previous patches.

Bug: 123925742
Fixes: 129719937
Test: treehugger; diff resulting builds
Test: diff list of product_target_FILES and product_host_FILES
Change-Id: I2ed8950320d31f5693323ad8cef6ec5b6780b7d4
Merged-In: I2ed8950320d31f5693323ad8cef6ec5b6780b7d4
(cherry picked from commit 8e96a794ac)
2019-04-10 17:04:48 -07:00
Anton Hansson
9ce8087afc Merge "Move board-info props to vendor/build.prop" into qt-dev 2019-04-10 12:39:24 +00:00
Anton Hansson
0643efcc5a Move board-info props to vendor/build.prop
This change moves the ro.build.require.* props extracted from
TARGET_BOARD_INFO_FILE to vendor/build.prop as opposed to
system/build.prop. These typically contain what bootloader and
baseband the build requires, which are very device-specific.

Bug: 130025216
Test: make, inspect props
Test: flash blueline
Change-Id: I48642485bdc853884d465d1fe00f2ceae69a4736
Merged-In: I48642485bdc853884d465d1fe00f2ceae69a4736
2019-04-10 12:38:59 +00:00
Dan Willemsen
2ab5c90e9c Add BUILD_BROKEN_USES_NETWORK
Some people apparently still talk to the network during their build.
Allow this temporarily with a BUILD_BROKEN_USES_NETWORK check.

Bug: 129992021
Test: attempt to talk to the network during the build with and without
      this flag
Change-Id: I45612ad6165f92f123847b4057338c0dfc3424ee
Merged-In: I45612ad6165f92f123847b4057338c0dfc3424ee
(cherry picked from commit 0586c65780)
2019-04-09 21:52:19 -07:00
TreeHugger Robot
a26d2189d1 Merge "Q Branch prefix is QP1A" into qt-dev 2019-04-10 04:31:28 +00:00
Paul Scovanner
bf5bc0bbb5 Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev am: e95d55db1c am: b293d74a3c am: c7c7763e18
am: ac3ae589d5

Change-Id: Ib876f29c2c0358e0b32cd93207044f74ca3def40
2019-04-09 17:14:14 -07:00
Paul Scovanner
1350102c53 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0 am: 3e8a1393a7 am: 9231b34069 am: ee14e56c76 -s ours
am: 91441ca650 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib50a27beb3a876d1a48ef801f6afd7cdbc204aea
2019-04-09 17:11:40 -07:00
Paul Scovanner
ac3ae589d5 Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev am: e95d55db1c am: b293d74a3c
am: c7c7763e18

Change-Id: Ib492d6c7909b92d07da1c9cb406deeac9094b162
2019-04-09 15:46:01 -07:00
Paul Scovanner
91441ca650 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0 am: 3e8a1393a7 am: 9231b34069
am: ee14e56c76 -s ours
am skip reason: subject contains skip directive

Change-Id: I270f4711add802057ccd3fe0327ca5691ea62a5a
2019-04-09 15:44:39 -07:00
Paul Scovanner
c7c7763e18 Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev am: e95d55db1c
am: b293d74a3c

Change-Id: I5312b7e1ff9d3558ab9c051dc34ab34ff9c4ea92
2019-04-09 14:22:23 -07:00
Paul Scovanner
ee14e56c76 [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0 am: 3e8a1393a7
am: 9231b34069

Change-Id: Iee0d3857d653ffed9888b742535008c781577adc
2019-04-09 14:21:09 -07:00
Ian Pedowitz
0f38bfccab Q Branch prefix is QP1A
Bug: 128934651
Bug: 129683166
Bug: 129943426
Test: source build/envsetup.sh && lunch aosp_blueline-userdebug
Test: m -j cts docs tests
Change-Id: I34c360a68c6721e8fef9e39be30c8af7bca90c39
2019-04-09 13:44:24 -07:00
Paul Scovanner
b293d74a3c Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev
am: e95d55db1c

Change-Id: Ie4e72858b9c41aedad54b82f4b65289132370c10
2019-04-09 13:22:43 -07:00
Paul Scovanner
0c72cb3937 [automerger skipped] Merge "[DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896" into pi-dev
am: 0ad5c1fe8b -s ours
am skip reason: subject contains skip directive

Change-Id: If61d08f5e3bd12ef57b5526364db49eeef9bf7b8
2019-04-09 13:17:43 -07:00
Paul Scovanner
9231b34069 [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0
am: 3e8a1393a7

Change-Id: I2a8ce7b192ccb2bbf23c342c88da45d9c3b3f070
2019-04-09 13:06:43 -07:00
Paul Scovanner
e95d55db1c Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev
* changes:
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a skipped: 04ba31ff57
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a
  [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896
2019-04-09 18:54:57 +00:00
Paul Scovanner
0ad5c1fe8b Merge "[DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896" into pi-dev 2019-04-09 18:50:22 +00:00
Paul Scovanner
b196cc6543 Merge "Update Security String to 2019-06-01 Bug:129374896" into qt-dev 2019-04-09 18:49:36 +00:00
Anton Hansson
509fb24dcd Merge "Move bootimage props to vendor/build.prop" into qt-dev 2019-04-09 16:47:48 +00:00
Anton Hansson
d4f9d62625 Move bootimage props to vendor/build.prop
Prior to this change the properties were in system/etc/default.prop.
These properties are device-specific and don't really belong on the
/system partition.

I anticipate further change to these properties in the future:
- pruning down the set of properties, as the .product. props
  don't make much sense for the boot image
- moving them to the ramdisk instead

Bug: 130025216
Test: boot into recovery, observe title (shows bootimage fingerprint)
Change-Id: I9e92c1ec7068ae18fa0d709c77eac22a6b88c3d8
Merged-In: I9e92c1ec7068ae18fa0d709c77eac22a6b88c3d8
2019-04-09 16:28:22 +01:00
Anton Hansson
4844d4f3c7 Enable JIT Zygote experiment in mainline boardconfig
Like Ie413f84c545c869ee336912a7b05ca80bb968129, but for all
mainline devices.

Bug: 119800099
Test: m
Change-Id: Ief77adaea61203a013f85cf870c5350253fdb7dd
Merged-In: Ief77adaea61203a013f85cf870c5350253fdb7dd
2019-04-09 13:02:44 +01:00
Mathieu Chartier
d31e4a9f85 Merge "Revert "Turn off app image startup cache temporarily"" into qt-dev 2019-04-08 23:20:08 +00:00
Paul Scovanner
63547acb5f [automerger skipped] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: 1f8f84de61 -s ours
am: 9c6046fb32 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie1efa4bc705a7d6a133f35f3e55aa4ee5056befc
2019-04-08 15:13:22 -07:00
Nicolas Geoffray
7b504b7b75 Merge "Move the profile rule out of dex_preopt_libart.mk." into qt-dev 2019-04-08 21:51:02 +00:00
Paul Scovanner
3e8a1393a7 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0
2019-04-08 21:48:10 +00:00
Paul Scovanner
9c6046fb32 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896
am: 1f8f84de61 -s ours
am skip reason: subject contains skip directive

Change-Id: I4dadebf0c3215c7c3aa8ec019d2cccdf8e5c6b07
2019-04-08 14:34:03 -07:00
Paul Scovanner
1f8f84de61 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-08 18:01:43 +00:00
Paul Scovanner
1453ddd306 Update Security String to 2019-06-01 Bug:129374896 2019-04-08 17:45:33 +00:00
Paul Scovanner
42fc9b3217 Merge "Update Security String to 2019-05-05 Bug:128322951" into qt-dev 2019-04-08 17:38:06 +00:00
Nicolas Geoffray
c2e947715e Move the profile rule out of dex_preopt_libart.mk.
We only need to define it once. dex_preopt_libart.mk can be read
multiple times if there are many boot image.

Test: m && no warning
Bug:119800099

(cherry picked from commit 7e8ca9a174)

Change-Id: I16d67b77142fce93c6d4acc15f557ad073b2de44
Merged-In: If5b8fbb0c3310eb42f676d7b5267dcee679f7e19
2019-04-08 09:56:29 +01:00
TreeHugger Robot
4a6b93ba16 Merge "Don't feed framework.jar to proguard for vendor apks" into qt-dev 2019-04-08 04:12:44 +00:00
Guang Zhu
be0cb591b1 Merge "Android Q is Android 10" into qt-dev 2019-04-06 00:07:10 +00:00
Paul Scovanner
5c17bbc567 Update Security String to 2019-05-05
Bug:128322951
2019-04-05 23:46:54 +00:00
Paul Scovanner
2db03695f4 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-05 23:32:13 +00:00
Mathieu Chartier
39adb5535d Revert "Turn off app image startup cache temporarily"
This reverts commit 8ef74918a9.

Bug: 128941180
Test: TH

Reason for revert: Regressions are mostly fixed

Change-Id: I4bef949b4ac9b11523482c6714345a250c11573a
2019-04-05 15:58:55 -07:00
Android Build Merger (Role)
c9025d9833 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a skipped: 04ba31ff57
Change-Id: I465e072206cdc9727df1d7cd1f71b4f8f5ef7d38
2019-04-05 21:22:23 +00:00
Android Build Merger (Role)
04ba31ff57 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a
Change-Id: I6e36aef2c3c3307fcf2a34d5b71dccae5fb217a1
2019-04-05 21:22:21 +00:00