Commit Graph

53666 Commits

Author SHA1 Message Date
Treehugger Robot 435dcbb845 Merge "Disable apex update for GSI" 2019-06-19 10:38:42 +00:00
Colin Cross 99f70b3488 Merge "Add more OWNERS" am: 9871d36024
am: 88a4a27a77

Change-Id: Ia65a85ed0751228f08a1ac93d8f847a04717c816
2019-06-19 02:46:35 -07:00
Colin Cross 88a4a27a77 Merge "Add more OWNERS"
am: 9871d36024

Change-Id: I2588f9a26ffddaf263f9b586477f6533e8784c55
2019-06-19 02:41:34 -07:00
Treehugger Robot 9871d36024 Merge "Add more OWNERS" 2019-06-19 09:34:14 +00:00
Tao Bao c1a1ec30df releasetools: Make common.ZipWriteStr Python 3 compatible.
Python 2 and 3 behave differently when calling ZipFile.writestr() with
zinfo.external_attr being 0. Python 3 uses `0o600 << 16` as the value
for such a case (since
18ee29d0b8),
which seems to make more sense. Otherwise the entry will end up with
0o000 as the permission bits. This CL updates common.ZipWriteStr to
follow the logic in Python 3, in order to get consistent behavior
between using the two versions.

Bug: 131631303
Test: `python -m unittest test_common.CommonZipTest`
Test: `python3 -m unittest test_common.CommonZipTest`
Change-Id: If8429855d922ef1ad76591f703215a0ce5089f0f
2019-06-18 23:53:53 -07:00
Dan Willemsen a05179c35e Merge changes from topics "rbe-deps-dexpreopt-images", "rbe-deps-system-modules" am: e346d8c25e
am: 2ae5ff07fa

Change-Id: Ifc672e6028ef67d4f6371049d287a3539aaa268d
2019-06-18 16:25:16 -07:00
Tao Bao ae64f09b06 Merge "releasetools: Update partitions in deterministic order." am: aadc9b9159
am: 269c12a5b9

Change-Id: Ic2bff4b76ccd4a0c5b3d3d71dedee0728fc16019
2019-06-18 16:23:38 -07:00
Tom Cherry 3156881708 Merge "Update fs_config documentation" am: 0405f780fc
am: 1e6a49a22a

Change-Id: Iec8d910916999ec35415bb295e88f3c8e88fd6e5
2019-06-18 16:21:45 -07:00
Dan Willemsen 2ae5ff07fa Merge changes from topics "rbe-deps-dexpreopt-images", "rbe-deps-system-modules"
am: e346d8c25e

Change-Id: Ie1b1a4befc9e7f82b58fb91faecb7c49c15c0ad7
2019-06-18 16:07:36 -07:00
Tao Bao 269c12a5b9 Merge "releasetools: Update partitions in deterministic order."
am: aadc9b9159

Change-Id: I3ae59fc50f0c4200043c7c4d94b02d6f9ac75e26
2019-06-18 15:54:45 -07:00
Tom Cherry 1e6a49a22a Merge "Update fs_config documentation"
am: 0405f780fc

Change-Id: I49e13626b13302aaf12f686963a0a970996bf262
2019-06-18 15:51:48 -07:00
Treehugger Robot e346d8c25e Merge changes from topics "rbe-deps-dexpreopt-images", "rbe-deps-system-modules"
* changes:
  Use dexpreopt image deps from Soong
  Depend on all the files from system modules
2019-06-18 22:48:22 +00:00
Tao Bao aadc9b9159 Merge "releasetools: Update partitions in deterministic order." 2019-06-18 22:20:26 +00:00
Treehugger Robot 0405f780fc Merge "Update fs_config documentation" 2019-06-18 22:08:46 +00:00
Tao Bao f1113e97ae releasetools: Update partitions in deterministic order.
Previously it was using regular dict.

Test: python -m unittest test_common.DynamicPartitionsDifferenceTest
Change-Id: If108a4512aeaf9d3c8775c030cad6e44342b9d3d
2019-06-18 12:14:32 -07:00
Neil Fuller ee8ef06510 Merge "Remove a host simulation of the runtime module" am: c4924c616c
am: b8e30c7602

Change-Id: I0b839272d84a88927de0a7f3193ebb8352fe9cfc
2019-06-18 08:57:48 -07:00
Neil Fuller b8e30c7602 Merge "Remove a host simulation of the runtime module"
am: c4924c616c

Change-Id: Icc6f7f25722a6f444e27b38376ee847a28198299
2019-06-18 08:48:06 -07:00
Neil Fuller c4924c616c Merge "Remove a host simulation of the runtime module" 2019-06-18 15:33:11 +00:00
SzuWei Lin 79e0d25c33 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
2019-06-18 18:23:18 +08:00
Isaac Chen fae280264e 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
2019-06-18 15:57:51 +08:00
Dan Willemsen cb4c357661 Use dexpreopt image deps from Soong
Instead of just depending on the single image file, depend on the entire
image that gets loaded -- the .oat / .vdex files, and the modules that
are part of the image that have their own files.

This is necessary for RBE, where the rule only gets the files that it
depends upon.

Test: treehugger
Test: build a system image with RBE
Change-Id: I93a580b42cf4ef1824ee1397e551c065f083348a
2019-06-18 01:19:04 +00:00
Dan Willemsen 70b934ee64 Depend on all the files from system modules
Test: treehugger
Change-Id: Ie84dda3d05a84658ad9386a3034d861138f25b2c
2019-06-18 01:19:04 +00:00
Colin Cross 01585fc876 Add more OWNERS
Test: none
Change-Id: I0d70871bbdd6e3a15e60d10e95f7630f5da3ccdb
2019-06-17 15:22:33 -07:00
Adam Seaton 7e3f7a3dae Revert "Update Security String from 08-05 to 2019-08-01 Bug:126590667"
am: 0c355124bf

Change-Id: I447039af635fa639c313aa2d8483d4e81ba07737
2019-06-17 14:59:17 -07:00
Tom Cherry de18e892d3 Update fs_config documentation
While searching for some fs_config related symbols, I ran across this
being out of date, so update it.

The new documentation defers to the help section of the underlying
script more to hopefully avoid this in the future.

Test: n/a
Change-Id: I94893cbb29b8d7e81963a12e3f8316ac3f41b7ae
2019-06-17 13:31:28 -07:00
Mitch Phillips ee2dcac47a Remove experimental pass manager for fuzzer builds.
Sanitizer coverage is currently broken with the experimental pass
manager. See b/133876586 for more information. The patch is currently
being worked on upstream (https://reviews.llvm.org/D62888), but is not
ready yet. Hence, we disable it here (similar to the LTO bug).

Bug: 133876586
Test: Build anything with SANITIZE_TARGET='fuzzer', verify that it has
'sancov' symbols.

Change-Id: I74d02e52ccbe2a3d96b6b8e30230197b554e60a0
2019-06-17 10:37:55 -07:00
Adam Seaton 0c355124bf Revert "Update Security String from 08-05 to 2019-08-01 Bug:126590667"
This reverts commit ef7c2c7915.

Reason for revert: Resolve string downgrade issue

Change-Id: I28831f2592bba09907b76c7d5ac46326a9c1e9f8
2019-06-17 17:03:51 +00:00
Jaewoong Jung e6f57e05ec Fixes a typo in a comment.
Test: TreeHugger
Change-Id: Ie124090280eb0c1235e50baa4a869399bb440abb
2019-06-16 21:48:42 -07:00
Patrick Tu 8543ca7fd5 Merge "AIDEGen: Collect the classes.jar of the prebuilt modules into module-info.json" am: 58982618e1
am: f7f933b28b

Change-Id: Ic1d4889712ae9cd36a44d73017f9115a3443858e
2019-06-16 21:18:39 -07:00
Patrick Tu f7f933b28b Merge "AIDEGen: Collect the classes.jar of the prebuilt modules into module-info.json"
am: 58982618e1

Change-Id: Idd3f21584984bf1c9a51bc83704da016f38dad36
2019-06-16 21:10:46 -07:00
Patrick Tu 58982618e1 Merge "AIDEGen: Collect the classes.jar of the prebuilt modules into module-info.json" 2019-06-17 02:51:56 +00:00
Dan Shi 4bfef31571 Merge "Update auto-gen test config template with EXTRA_CONFIGS placeholder" am: fde58bccbc
am: 4722b5b158

Change-Id: Ifc9d04794b8a5bf9bc5cc3eb6efd4529c05e839a
2019-06-14 15:45:15 -07:00
Dan Shi 4722b5b158 Merge "Update auto-gen test config template with EXTRA_CONFIGS placeholder"
am: fde58bccbc

Change-Id: I271b0b67e7ae9a7df8a3f17b4cbbd362ece5cfe1
2019-06-14 15:37:11 -07:00
Dan Shi fde58bccbc Merge "Update auto-gen test config template with EXTRA_CONFIGS placeholder" 2019-06-14 22:21:39 +00:00
Daniel Norman c7c103514f Merge "Allows skipping building the super images for partial builds." am: 87ebb3013f
am: d3576727ea

Change-Id: I872f713f9f8ff30b3dd72643b07443894b5af451
2019-06-14 15:12:25 -07:00
Daniel Norman d3576727ea Merge "Allows skipping building the super images for partial builds."
am: 87ebb3013f

Change-Id: I67085d543d8bdeea742e50f4bfae6cf586acb18f
2019-06-14 14:59:00 -07:00
Treehugger Robot 87ebb3013f Merge "Allows skipping building the super images for partial builds." 2019-06-14 21:42:33 +00:00
Dan Willemsen 27e5d4e886 Merge "Start the deprecation of BUILD_HOST_STATIC_LIBRARY" am: 2e1516dc44
am: 8a0a26b246

Change-Id: I55bd3f5c4f8f6863b154c8bdb02c187b568872af
2019-06-14 14:13:45 -07:00
Hridya Valsaraju a0d14a8647 Merge "Fail build when sum of sizes of logical partitions exceeds OEM-set limit" am: acfbc544e6
am: a7f33ab8d9

Change-Id: I9b8df9e495a20bc01bbe383c3f1d359faa9cea94
2019-06-14 14:12:02 -07:00
Dan Willemsen 8a0a26b246 Merge "Start the deprecation of BUILD_HOST_STATIC_LIBRARY"
am: 2e1516dc44

Change-Id: Ibffc6ffb73d1efe2c9fa7d9c821774ca0916e7a1
2019-06-14 13:56:43 -07:00
Hridya Valsaraju a7f33ab8d9 Merge "Fail build when sum of sizes of logical partitions exceeds OEM-set limit"
am: acfbc544e6

Change-Id: Id2af75f3fdacddae343da59bb85f6ab71c80e1ca
2019-06-14 13:55:39 -07:00
Paul Scovanner c639959061 Update Security String from 08-05 to 2019-08-01 Bug:126590667 am: ead61ed19e
am: ef7c2c7915

Change-Id: I4a4c8d8fa0a1a4dc9ecd1dc2cb2a235c730fe223
2019-06-14 13:35:35 -07:00
Treehugger Robot 2e1516dc44 Merge "Start the deprecation of BUILD_HOST_STATIC_LIBRARY" 2019-06-14 20:28:46 +00:00
Treehugger Robot acfbc544e6 Merge "Fail build when sum of sizes of logical partitions exceeds OEM-set limit" 2019-06-14 20:23:08 +00:00
Paul Scovanner ef7c2c7915 Update Security String from 08-05 to 2019-08-01 Bug:126590667
am: ead61ed19e

Change-Id: Iaf434bf5690c3c50371bb11266d300ab7d335184
2019-06-14 13:22:34 -07:00
Daniel Norman 0bf940cace 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: 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
2019-06-14 11:42:45 -07:00
Dan Willemsen 22f69e1094 Start the deprecation of BUILD_HOST_STATIC_LIBRARY
There aren't any common users of this left on AOSP, and only a few
internally.

Test: treehugger
Change-Id: I37277dbf10aa253ef64ca748f82765d16ae1cf80
2019-06-14 09:37:42 -07:00
Hridya Valsaraju 219b6294dc Fail build when sum of sizes of logical partitions exceeds OEM-set limit
BOARD_SUPER_PARTITION_ERROR_LIMIT can be set by OEMs to cause a
build failure when the sum of sizes of logical partitions exceeds the same.
It is set to BOARD_SUPER_PARTITION_SIZE by default.

Bug: 133329143
Test: mmm -j32

Change-Id: Ief85c9ab3e3b9d071cd22b70e13b5c64bb784b9c
2019-06-14 09:34:46 -07:00
bohu 5d94c784bb Merge "emulator: add option to disable avb" am: 4934e72933
am: f32b62266a

Change-Id: I1fd1755b951d9c2cdc42e4c794b1a2e850b79b4a
2019-06-14 04:36:02 -07:00
bohu f32b62266a Merge "emulator: add option to disable avb"
am: 4934e72933

Change-Id: I15f2944839ff01f0c2756cc484b98df3c27bf6cb
2019-06-14 04:22:53 -07:00