Commit graph

52425 commits

Author SHA1 Message Date
Victor Chang
c3538a4ac0 Remove libicu*.so from /system
Bug: 120659668
Test: CtsJniTestCases
Merged-In: I1c2ab41aa0b19f71025e2dd09be9b9bd306e8616
Change-Id: I1c2ab41aa0b19f71025e2dd09be9b9bd306e8616
(cherry picked from commit c164b8ef13)
2019-04-15 12:36:50 +01:00
Jiyong Park
fa51bedf8b Add updatable_apex.mk
The product abstracts configs that need to be set to support updating of
APEXes.

Bug: 130418467
Test: m
Test: adb shell getprop ro.apex.updatable in Pixel 2 and 3
Test: adb shell /system/apex/com.android.apex.cts.shim.apex exists.
Change-Id: Idb44388a0cf6338f8b4500a1d0d2762ed59476bf
2019-04-15 20:34:18 +09:00
Alistair Strachan
e4a2c3af61 Merge "FileImage: make thread-safe" into qt-dev 2019-04-13 23:23:33 +00:00
Paul Scovanner
94278a7c2e Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0 am: 3ae4e858b7 am: cce67c52c9 am: e90b407c2f
am: 593be3c494

Change-Id: I7e489272790ad882be94a95886e2c474f7b1f84a
2019-04-13 01:07:31 -07:00
Paul Scovanner
593be3c494 Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0 am: 3ae4e858b7 am: cce67c52c9
am: e90b407c2f

Change-Id: I451be3f8467540539c00be5d02798be830f89ff1
2019-04-12 20:54:41 -07:00
Paul Scovanner
e90b407c2f Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0 am: 3ae4e858b7
am: cce67c52c9

Change-Id: Iad4a6c33c50cc2fd213a6a207c920ee540ae1c43
2019-04-12 20:25:15 -07:00
Paul Scovanner
cce67c52c9 Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0
am: 3ae4e858b7

Change-Id: I02ef18033096d4e6d22f0eb945b4b630104e4609
2019-04-12 19:35:43 -07:00
TreeHugger Robot
6d5a72368d Merge changes from topic "dap_cuttlefish" into qt-dev
* changes:
  Allow generating OTA package from non-sparse images.
  Fix DataImage.ReadRangeSet()
  releasetools: Remove the name restriction in common.GetSparseImage.
2019-04-13 00:36:02 +00:00
Paul Scovanner
3d6b8b2896 Merge "Update Security String to 2019-06-05 Bug:129374896" into qt-dev 2019-04-12 23:42:34 +00:00
Yifan Hong
210ede323f FileImage: make thread-safe
FileImage needs to be thread-safe because multiple
threads gets data from it when an incremental OTA
package is created.

Test: apply incremental OTA on cuttlefish
Bug: 113175337
Change-Id: I31637fce0fbd66f3fa6c5c478da09bae65a52229
Merged-In: I31637fce0fbd66f3fa6c5c478da09bae65a52229
2019-04-12 15:59:03 -07:00
Paul Scovanner
3ae4e858b7 Update Security String to 2019-06-05
Bug:129374896
Merged-In: 2c26c3d4c0
2019-04-12 18:40:01 +00:00
Yifan Hong
50db54519e Allow generating OTA package from non-sparse images.
Test: build OTA package in cuttlefish

Bug: 120041578
Bug: 113175337
Change-Id: I246c38e08376c837b7f126aa19cb8c1d73ed1e26
Merged-In: I246c38e08376c837b7f126aa19cb8c1d73ed1e26
2019-04-12 10:48:29 -07:00
Yifan Hong
508850e298 Fix DataImage.ReadRangeSet()
It returns a list of one generator object, not a list
of strings.

Test: test_blockimgdiff
Bug: 113175337

Change-Id: I8962c539c2ce3fae90d428b38c4b0e52c5a2cdad
Merged-In: I8962c539c2ce3fae90d428b38c4b0e52c5a2cdad
2019-04-12 10:48:21 -07:00
Tao Bao
222bba6253 releasetools: Remove the name restriction in common.GetSparseImage.
The function used to be serving system and vendor partitions only (as
they were the only partitions using sparse image at the point). The code
itself doesn't rely on anything specific to system/vendor.

Test: python -m unittest test_common
Bug: 113175337

Change-Id: Ia4ecdeedb262f3d9db082128eaf9bab299983333
Merged-In: Ia4ecdeedb262f3d9db082128eaf9bab299983333
2019-04-12 10:47:53 -07:00
TreeHugger Robot
93b2a10b6e Merge "Export more config values to Soong" into qt-dev 2019-04-12 17:24:18 +00:00
Paul Scovanner
2c26c3d4c0 Update Security String to 2019-06-05 Bug:129374896 2019-04-12 16:39:24 +00:00
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
Colin Cross
27ba4730f3 Export more config values to Soong
Export more config values to Soong that will be use dto generate
robolectric's build.prop.

Bug: 122331577
Test: m checkbuild
Change-Id: I1e9dd165772a071cf78927b3bf1e29e01290a42e
2019-04-11 10:52:18 -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