Commit graph

50076 commits

Author SHA1 Message Date
Yifan Hong
6f3eaeb84d Fix DataImage.ReadRangeSet()
It returns a list of one generator object, not a list
of strings.

Test: test_blockimgdiff
Change-Id: I8962c539c2ce3fae90d428b38c4b0e52c5a2cdad
2019-04-09 17:01:53 -07:00
Treehugger Robot
f1f33dc1dd Merge "Add BUILD_BROKEN_USES_NETWORK" 2019-04-09 23:59:34 +00:00
Ian Pedowitz
0604ae4881 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
Merged-In: I34c360a68c6721e8fef9e39be30c8af7bca90c39
2019-04-09 13:00:09 -07:00
Yifan Hong
8c3dce0c56 Reland "Only assert-max-image-size for static partitions."
This reverts commit 6e099095d1.

Reason for revert: reland the CL

Bug: 122377935
Test: build blueline_mainline

Change-Id: Iee594b64e687decff186c0fa60f82b88608febe9
2019-04-09 10:56:34 -07:00
Dan Willemsen
0586c65780 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
2019-04-09 09:59:31 -07:00
Mathieu Chartier
ec870fe90c Merge "Specify default image block size of 512KB by default"
am: d7d6e9d671

Change-Id: I80273d77e2e419de3fcd79de95c97d9966b6b38d
2019-04-09 08:43:06 -07:00
Mathieu Chartier
d7d6e9d671 Merge "Specify default image block size of 512KB by default" 2019-04-09 15:31:54 +00:00
Anton Hansson
f1d25e0592 Merge "Move bootimage props to vendor/build.prop"
am: 6b329bc60d

Change-Id: I72dcc9ee89572d23e7a62f164687b5e4f27388b0
2019-04-09 07:11:51 -07:00
Anton Hansson
6b329bc60d Merge "Move bootimage props to vendor/build.prop" 2019-04-09 14:01:51 +00:00
Florian Mayer
3db0c17630 Merge "Revert "Only assert-max-image-size for static partitions.""
am: 1d26ca95c3

Change-Id: I82d0e53f7a817f661b46556b2e59279e132119ad
2019-04-09 06:31:45 -07:00
Florian Mayer
1d26ca95c3 Merge "Revert "Only assert-max-image-size for static partitions."" 2019-04-09 13:21:23 +00:00
Paul Duffin
bff6f6e65d Merge "Remove android.test.base from bootclasspath"
am: 70a875afec

Change-Id: Ie2a5f4298b7ae40e823f2cd4b3a6e69754860eca
2019-04-09 03:44:39 -07:00
Paul Duffin
70a875afec Merge "Remove android.test.base from bootclasspath" 2019-04-09 10:35:41 +00:00
Florian Mayer
6e099095d1 Revert "Only assert-max-image-size for static partitions."
This reverts commit 67e4336912.

Reason for revert: Broke master

Change-Id: I8a5054a42f145881437e2cb5b372f276bfdaa3d2
2019-04-09 09:54:59 +00:00
Anton Hansson
40af566c4f Merge "Enable JIT Zygote experiment in mainline boardconfig"
am: f49c38c2c1

Change-Id: Id797693efa4b33d434baa37e66a8faaa0488e143
2019-04-09 02:06:16 -07:00
Anton Hansson
f49c38c2c1 Merge "Enable JIT Zygote experiment in mainline boardconfig" 2019-04-09 08:42:32 +00:00
Xin Li
66d7037ae6 [automerger skipped] Merge "DO NOT MERGE -- Merge PPRL.190405.003 into master"
am: a76f88be02 -s ours
am skip reason: subject contains skip directive

Change-Id: I31b3683720caf9ac4b9a0b1b5129a8b094d60954
2019-04-08 22:12:37 -07:00
Xin Li
a76f88be02 Merge "DO NOT MERGE -- Merge PPRL.190405.003 into master" 2019-04-09 04:29:23 +00:00
Xin Li
5544272fca Merge "DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master" into stage-aosp-master 2019-04-09 04:28:37 +00:00
Yifan Hong
27128f4b10 Merge changes from topic "dap_size_check"
am: 3c4889fc79

Change-Id: I58130717a9aaf1a70ecebb85eaf783e1d3d2f504
2019-04-08 21:20:02 -07:00
Treehugger Robot
3c4889fc79 Merge changes from topic "dap_size_check"
* changes:
  Only assert-max-image-size for static partitions.
  sparse_img.py --get_partition_size return size of partition
  Revert "Fix dynamic partition size check for devices with recovery"
2019-04-09 02:17:36 +00:00
Xin Li
8d900c6144 DO NOT MERGE -- Merge PPRL.190405.003 into master
Bug: 130175407
Change-Id: I677403b7e0038f4ba74270b4ce8553a360e46734
2019-04-08 18:56:51 -07:00
Xin Li
8a71c7780e DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master
Bug: 130175407
Change-Id: I9257360e13cd89dfa4779b01d3b2d6d24ea21c1b
2019-04-08 15:04:31 -07:00
Mathieu Chartier
6cbc3899b3 Specify default image block size of 512KB by default
Enables parallel decompression.

Test: manual
Bug: 116052292
Change-Id: I172935c8dd9c729199d9015e82487f84018bb9f4
2019-04-08 13:56:40 -07:00
android-build-team Robot
505063f5ad Make change and version bump to PPRL.190405.003
Change-Id: I9a4ecf96a9bfac0eef95d5176cf05b4f84ec7699
2019-04-08 18:50:28 +00:00
android-build-team Robot
10d2ada411 Make change and version bump to PPRL.190405.001
Change-Id: I3f3474b30f18066560d8bd51dd72f183894918fe
2019-04-08 18:16:44 +00:00
Anton Hansson
15794ca03c 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
2019-04-08 17:47:35 +01:00
Paul Duffin
fad04b7591 Remove android.test.base from bootclasspath
Default to exclude android.test.base from the bootclasspath unless the
REMOVE_ATB_FROM_BCP flag is set to false.

Bug: 73711752
Test: make droid, flash, atest -p cts/tests/signature/
Change-Id: Iabcda707ff0f0b4ec7cade1125938a2759af8f76
2019-04-08 10:32:05 +01:00
Nicolas Geoffray
a4511bfb04 Merge "Move the profile rule out of dex_preopt_libart.mk."
am: 6b529750c5

Change-Id: Idcf23e21895bfee8a01a50b5fcafe215c7c39fc1
2019-04-08 02:10:40 -07:00
Nicolas Geoffray
6b529750c5 Merge "Move the profile rule out of dex_preopt_libart.mk." 2019-04-08 08:55:19 +00:00
George Burgess IV
40ecaea185 Merge "Remove our clang-tidy wrapper"
am: 6afe016825

Change-Id: I628822559916c1b36b326fa4ed9d614fae696c34
2019-04-05 17:17:10 -07:00
Treehugger Robot
6afe016825 Merge "Remove our clang-tidy wrapper" 2019-04-05 21:58:36 +00:00
Anton Hansson
66bd1852f1 Enable JIT Zygote experiment in mainline boardconfig
Like Ie413f84c545c869ee336912a7b05ca80bb968129, but for all
mainline devices.

Bug: 119800099
Test: m
Change-Id: Ief77adaea61203a013f85cf870c5350253fdb7dd
2019-04-05 18:45:17 +01:00
Nicolas Geoffray
7e8ca9a174 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
Change-Id: If5b8fbb0c3310eb42f676d7b5267dcee679f7e19
2019-04-05 18:44:15 +01:00
Jiyong Park
069b3833de Merge "Don't feed framework.jar to proguard for vendor apks"
am: 639861ab66

Change-Id: If99059d133395db0caa45ba0b94786d7495239a3
2019-04-05 05:56:01 -07:00
Treehugger Robot
639861ab66 Merge "Don't feed framework.jar to proguard for vendor apks" 2019-04-05 12:40:18 +00:00
Nicolas Geoffray
ae769f6391 Merge "Pass DEXPREOPT_USE_APEX_IMAGE to soong."
am: 39099e8498

Change-Id: Id3dfd643b7d29cbe93fb2a80d30cc865ff2bffb8
2019-04-05 02:56:31 -07:00
Nicolas Geoffray
39099e8498 Merge "Pass DEXPREOPT_USE_APEX_IMAGE to soong." 2019-04-05 09:34:34 +00:00
Anton Hansson
5fccb018a9 Merge "Move device-specific vars from mainline common"
am: 049c1f9235

Change-Id: Ia5851b31d98340c6e893bddf1e83d062b824d50f
2019-04-04 23:57:35 -07:00
Anton Hansson
049c1f9235 Merge "Move device-specific vars from mainline common" 2019-04-05 06:44:44 +00:00
Yifan Hong
28c875581c Merge "Build non-sparse super image if necessary."
am: 405d3a4ade

Change-Id: I3b9c5489d9cdd60a57fc9093ff1083cba94075bf
2019-04-04 16:22:37 -07:00
George Burgess IV
09e5d9b2ba Remove our clang-tidy wrapper
Looks like the reason for it existing has been fixed. It should probably
just be removed.

Bug: None
Test: WITH_TIDY=1 m
Change-Id: Ic001393da7211cd6ef2bbd5af6ef13c7fe8e00e7
2019-04-04 16:21:53 -07:00
Treehugger Robot
405d3a4ade Merge "Build non-sparse super image if necessary." 2019-04-04 23:16:06 +00:00
Yifan Hong
67e4336912 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)

Fixes: 122377935
Change-Id: I75e1b8322197cb18cf397d02aefd49d777bb6405
2019-04-04 15:09:51 -07:00
Jaewoong Jung
c6f338a172 Merge "prebuilt_internal.mk refactoring."
am: 15d56810ca

Change-Id: Icff34ffa61bea06db4b68c068eeb85945ba3d677
2019-04-04 15:02:16 -07:00
Jaewoong Jung
15d56810ca Merge "prebuilt_internal.mk refactoring." 2019-04-04 21:52:47 +00:00
Elliott Hughes
ec7a6e26cb Merge "Remove 'column' from modules target"
am: 24e47858f2

Change-Id: I458a9554992bde1ace709e51724aade2aa23c786
2019-04-04 13:38:00 -07:00
Elliott Hughes
24e47858f2 Merge "Remove 'column' from modules target" 2019-04-04 20:17:05 +00:00
Yifan Hong
7ad83b634e 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
2019-04-04 12:59:00 -07:00
Yifan Hong
bd4301e190 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
2019-04-04 12:48:14 -07:00