Commit Graph

73813 Commits

Author SHA1 Message Date
Michael Wright
42f68fbf39 Revert back to 12 instead of 12L
Bug: 206132499
Bug: 204295952
Test: N/A
Change-Id: I7f87d189030e97f47dc81b756d1397b4aa65daf0
2021-11-15 21:23:01 +00:00
Treehugger Robot
31b3bf7e11 Merge "Configure boot image profiles for platform and unbundled ART module builds." am: 35e7ab363c am: b025e958cb am: 8964be56b4
Original change: https://android-review.googlesource.com/c/platform/build/+/1881863

Change-Id: I10c8cf1d3d77513c95fdfadece936a3ee3aab79f
2021-11-12 20:49:40 +00:00
Treehugger Robot
8964be56b4 Merge "Configure boot image profiles for platform and unbundled ART module builds." am: 35e7ab363c am: b025e958cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1881863

Change-Id: I72d4b8e70f20601dd6cdc1d75e944c980e9dd17e
2021-11-12 20:32:35 +00:00
Treehugger Robot
b025e958cb Merge "Configure boot image profiles for platform and unbundled ART module builds." am: 35e7ab363c
Original change: https://android-review.googlesource.com/c/platform/build/+/1881863

Change-Id: Iede7cafd97ee8d164763f9e0afb480d3e9180c48
2021-11-12 20:15:10 +00:00
Treehugger Robot
35e7ab363c Merge "Configure boot image profiles for platform and unbundled ART module builds." 2021-11-12 19:56:53 +00:00
TreeHugger Robot
8702eff856 Merge "S V2 is now REL" into sc-v2-dev-plus-aosp 2021-11-12 17:44:52 +00:00
Treehugger Robot
53a0a19fef Merge changes from topic "fsverity_digest" am: 866d824328 am: f90fb54430 am: 173e8a3f90
Original change: https://android-review.googlesource.com/c/platform/build/+/1855993

Change-Id: Ib335c84762c9d743b29d20502e24db6be5443585
2021-11-12 07:19:55 +00:00
Treehugger Robot
173e8a3f90 Merge changes from topic "fsverity_digest" am: 866d824328 am: f90fb54430
Original change: https://android-review.googlesource.com/c/platform/build/+/1855993

Change-Id: I90c59cf7900eda8f903852c6de77868960cdaa01
2021-11-12 07:02:16 +00:00
Treehugger Robot
f90fb54430 Merge changes from topic "fsverity_digest" am: 866d824328
Original change: https://android-review.googlesource.com/c/platform/build/+/1855993

Change-Id: I971194b0a6372e6c913a015bcaffef22a9adc317
2021-11-12 06:42:13 +00:00
Treehugger Robot
866d824328 Merge changes from topic "fsverity_digest"
* changes:
  Add fsverity digest manifest
  Implement fsverity metadata generator
2021-11-12 06:26:30 +00:00
Treehugger Robot
edce9368fd Merge "Revert "Add fsverity test key"" am: edf3230c76 am: 2b15898d7f am: 9dbc9d400e
Original change: https://android-review.googlesource.com/c/platform/build/+/1888499

Change-Id: Ibcfdee0950a4ccd49ed688d852a9985d5497f3f0
2021-11-11 19:34:35 +00:00
Michael Wright
65a7e5e2bd S V2 is now REL
Bug: 204295952
Test: N/A
Change-Id: I5f94e458bf0c420341847a49242da20c9b4281e4
Merged-In: I5f94e458bf0c420341847a49242da20c9b4281e4
2021-11-11 19:21:48 +00:00
Treehugger Robot
9dbc9d400e Merge "Revert "Add fsverity test key"" am: edf3230c76 am: 2b15898d7f
Original change: https://android-review.googlesource.com/c/platform/build/+/1888499

Change-Id: I7900c70dbc7cbd8295c8b21a91643ed3a2911ba4
2021-11-11 19:12:59 +00:00
Treehugger Robot
2b15898d7f Merge "Revert "Add fsverity test key"" am: edf3230c76
Original change: https://android-review.googlesource.com/c/platform/build/+/1888499

Change-Id: I6e735e8387658ade57826c089aa0263ab5873205
2021-11-11 18:47:01 +00:00
Treehugger Robot
edf3230c76 Merge "Revert "Add fsverity test key"" 2021-11-11 18:29:58 +00:00
Martin Stjernholm
1f925ed13e Configure boot image profiles for platform and unbundled ART module
builds.

- Use art/build/boot/boot-image-profile.txt for the primary boot image
  in the ART module, both when it's built from source in platform and
  as an unbundled module.

- Use frameworks/base/boot/boot-image-profile.txt for the framework
  extension image in platform, but not in unbundled builds.

This should obsolete the combined profile
frameworks/base/config/boot-image-profile.txt.

Test: build/soong/soong_ui.bash --dumpvar-mode \
        PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION
  and check that it prints both art/build/boot/boot-image-profile.txt
  and frameworks/base/boot/boot-image-profile.txt in a platform build
  on master.
Test: build/soong/soong_ui.bash --dumpvar-mode \
        PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION
  and check that it prints only art/build/boot/boot-image-profile.txt
  in an unbundled build on master-art.
Test: banchan com.android.art && m
  on master-art and check that
  out/soong/.intermediates/art/build/apex/com.android.art/android_common_com.android.art_image/image.apex/javalib/x86_64/boot.oat
  shrinks from 14 MB to 4.7.
Test: m droid
  on master and check that
  out/soong/.intermediates/art/build/apex/com.android.art/android_common_com.android.art_image/image.apex/javalib/x86_64/boot.oat
  and out/target/product/vsoc_x86_64/system/framework/x86_64/boot-framework.oat
  don't change size significantly.
Test: lunch armv8-eng && art/tools/buildbot-build.sh
  on master-art
Bug: 174746397
Change-Id: I77d7f73b1af414493ca00d2abf3a1e8b32c51d86
2021-11-11 16:01:51 +00:00
Inseob Kim
f69346e0a8 Add fsverity digest manifest
fsverity digest manifest stores a map from files to fsverity digests.
The manifest is installed as a serialized protobuf file, to a signed apk
system/etc/security/fsverity/BuildManifest.apk.

Bug: 193113311
Test: build with PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true
Change-Id: I55fc10400206b8ce0d5f198faea08fe3930b362c
2021-11-11 11:19:44 +00:00
Inseob Kim
b73f8dcc05 Revert "Add fsverity test key"
This reverts commit 10255c8946.

Reason for revert: redundant for now

Change-Id: I756be1cfe3f4c8a2b8226955b8d9d963e40c71ae
2021-11-11 08:43:42 +00:00
Inseob Kim
9cda397948 Implement fsverity metadata generator
Using fsverity tool, fsverity metadata for specific artifacts in system
mage can be generated. Users can do that by setting a makefile variable
PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA to true.

If set to true, the following artifacts will be signed.

- system/framework/*.jar
- system/framework/oat/<arch>/*.{oat,vdex,art}
- system/etc/boot-image.prof
- system/etc/dirty-image-objects

One fsverity metadata container file per one input file will be
generated in system.img, with a suffix ".fsv_meta". e.g. a container
file for "system/framework/foo.jar" will be
"system/framework/foo.jar.fsv_meta".

Bug: 193113311
Test: build with PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true
Change-Id: Ib70d591a72d23286b5debcb05fbad799dfd79b94
2021-11-11 17:30:19 +09:00
Treehugger Robot
0622a4fed6 Merge "Record ALL_DEPS by default." am: 372d74a8c9 am: 44ce81a207 am: 97e85dcf4a am: 180720602f
Original change: https://android-review.googlesource.com/c/platform/build/+/1878199

Change-Id: I434737a8d4c2170e99ff8d5eadee88a11c6efcea
2021-11-11 05:38:52 +00:00
Eric Miao
f2353be753 Merge "Add oatdump and dexdump to dexpreopt_tools.zip" am: 6f2d435d8d am: caddb0004f am: 2a03d646ca am: 4f869bee85
Original change: https://android-review.googlesource.com/c/platform/build/+/1883261

Change-Id: I800c748f2cbd2591db4919688931125c17675106
2021-11-11 05:38:41 +00:00
Treehugger Robot
180720602f Merge "Record ALL_DEPS by default." am: 372d74a8c9 am: 44ce81a207 am: 97e85dcf4a
Original change: https://android-review.googlesource.com/c/platform/build/+/1878199

Change-Id: Ie3857d2cbe402003f02981aaf21bfd0217d4725d
2021-11-11 05:22:48 +00:00
Eric Miao
4f869bee85 Merge "Add oatdump and dexdump to dexpreopt_tools.zip" am: 6f2d435d8d am: caddb0004f am: 2a03d646ca
Original change: https://android-review.googlesource.com/c/platform/build/+/1883261

Change-Id: If1747d49ea9a6244e2c70fea5eb6578a35243d5e
2021-11-11 05:22:34 +00:00
Treehugger Robot
97e85dcf4a Merge "Record ALL_DEPS by default." am: 372d74a8c9 am: 44ce81a207
Original change: https://android-review.googlesource.com/c/platform/build/+/1878199

Change-Id: I64c344b6069423316a0cf6d5cf61f61fb0e8ad70
2021-11-11 05:04:51 +00:00
Eric Miao
2a03d646ca Merge "Add oatdump and dexdump to dexpreopt_tools.zip" am: 6f2d435d8d am: caddb0004f
Original change: https://android-review.googlesource.com/c/platform/build/+/1883261

Change-Id: I5e8f59370d51845a84e2e4964ec63b88996785ee
2021-11-11 05:04:44 +00:00
Treehugger Robot
44ce81a207 Merge "Record ALL_DEPS by default." am: 372d74a8c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1878199

Change-Id: Ib9fabe5af8c027845c4c3d01e4670f1260083661
2021-11-11 04:49:34 +00:00
Eric Miao
caddb0004f Merge "Add oatdump and dexdump to dexpreopt_tools.zip" am: 6f2d435d8d
Original change: https://android-review.googlesource.com/c/platform/build/+/1883261

Change-Id: I8d65507b89c435a19e54bc9561ff2a1ca2f8370f
2021-11-11 04:49:23 +00:00
Treehugger Robot
372d74a8c9 Merge "Record ALL_DEPS by default." 2021-11-11 04:48:16 +00:00
Eric Miao
6f2d435d8d Merge "Add oatdump and dexdump to dexpreopt_tools.zip" 2021-11-11 04:30:27 +00:00
Jim Tang
5c6410edee Record ALL_DEPS by default.
Abandon the use of RECORD_ALL_DEPS to record ALL_DEPS.

BUG: 204397180

Test: m, and inspect module-info.json.
Change-Id: Iaf35580b52c11ad37017b1fb8e0937b859d3f55b
2021-11-11 10:24:51 +08:00
Treehugger Robot
e9b9bc2203 Merge "Fix BOARD_SYSTEMSDK_VERSIONS checks" am: 7bd2d13cde am: f5b59967b4 am: 3ac2ecaff6 am: a7b02fdb27
Original change: https://android-review.googlesource.com/c/platform/build/+/1885789

Change-Id: I14628044e00b19703c72d8b894e4619b4790f9f6
2021-11-11 00:41:50 +00:00
Treehugger Robot
a7b02fdb27 Merge "Fix BOARD_SYSTEMSDK_VERSIONS checks" am: 7bd2d13cde am: f5b59967b4 am: 3ac2ecaff6
Original change: https://android-review.googlesource.com/c/platform/build/+/1885789

Change-Id: I120a8a133715209dbc5c8c19cf0ef8665924896a
2021-11-11 00:24:43 +00:00
Treehugger Robot
3ac2ecaff6 Merge "Fix BOARD_SYSTEMSDK_VERSIONS checks" am: 7bd2d13cde am: f5b59967b4
Original change: https://android-review.googlesource.com/c/platform/build/+/1885789

Change-Id: I9a438d7e43488e6c68a0d9686d6760642d2c220b
2021-11-11 00:13:12 +00:00
Treehugger Robot
f5b59967b4 Merge "Fix BOARD_SYSTEMSDK_VERSIONS checks" am: 7bd2d13cde
Original change: https://android-review.googlesource.com/c/platform/build/+/1885789

Change-Id: I9fda76d7ddf8cd478c7fd1ca4bfeff9dd8f540ab
2021-11-10 23:55:21 +00:00
Treehugger Robot
7bd2d13cde Merge "Fix BOARD_SYSTEMSDK_VERSIONS checks" 2021-11-10 23:38:28 +00:00
Cole Faust
eb404fac37 Merge "Add soong_config_get" am: e856367da1 am: 88fac99ae6 am: 7e00224e10 am: 40886414ba
Original change: https://android-review.googlesource.com/c/platform/build/+/1883263

Change-Id: Ifa459c801c327c6709a3d08ca89e697e03fb64fa
2021-11-10 21:15:57 +00:00
Cole Faust
40886414ba Merge "Add soong_config_get" am: e856367da1 am: 88fac99ae6 am: 7e00224e10
Original change: https://android-review.googlesource.com/c/platform/build/+/1883263

Change-Id: I46f84d4796b9d586e713c2919c8e5a0afaeefed9
2021-11-10 20:59:27 +00:00
Cole Faust
7e00224e10 Merge "Add soong_config_get" am: e856367da1 am: 88fac99ae6
Original change: https://android-review.googlesource.com/c/platform/build/+/1883263

Change-Id: I6b948b9535e93af86578e90e36e203b44f686f4d
2021-11-10 20:41:27 +00:00
Cole Faust
88fac99ae6 Merge "Add soong_config_get" am: e856367da1
Original change: https://android-review.googlesource.com/c/platform/build/+/1883263

Change-Id: I0984724f7bf440ae59a8380b250539a0d9c9cf96
2021-11-10 20:25:31 +00:00
Cole Faust
e856367da1 Merge "Add soong_config_get" 2021-11-10 19:46:48 +00:00
Tianjie Xu
29ef79795f Merge "Fix python3 incompatiable code" am: 7a048996b7 am: 4d6bc649e8 am: bff0316e3c am: 1fbeb8b694
Original change: https://android-review.googlesource.com/c/platform/build/+/1886461

Change-Id: Id9f552fd9a34fe7297b5de7a1be5e304e8c1c16a
2021-11-10 17:58:34 +00:00
Treehugger Robot
24b2d48ef9 Merge changes from topic "soong-java-install" am: 585ec03c47 am: 7be9f15f4b am: ce754c6762 am: 64b04c716e
Original change: https://android-review.googlesource.com/c/platform/build/+/1880594

Change-Id: Ie2c99974ba909c0a693892c0012684f23f5eb5a3
2021-11-10 17:58:14 +00:00
Tianjie Xu
1fbeb8b694 Merge "Fix python3 incompatiable code" am: 7a048996b7 am: 4d6bc649e8 am: bff0316e3c
Original change: https://android-review.googlesource.com/c/platform/build/+/1886461

Change-Id: I6ab6e845e36caa8c4d3b618ff12ba88250c46832
2021-11-10 17:53:26 +00:00
Treehugger Robot
64b04c716e Merge changes from topic "soong-java-install" am: 585ec03c47 am: 7be9f15f4b am: ce754c6762
Original change: https://android-review.googlesource.com/c/platform/build/+/1880594

Change-Id: I84deb185f2bab6590802b81becb78ef0d3ef20c8
2021-11-10 17:52:39 +00:00
Anton Hansson
a04657592c Merge "Fix product single value variables failed issue" am: 0e21221d30 am: 1564e90a14 am: ec88e00164 am: 6537f5fc66
Original change: https://android-review.googlesource.com/c/platform/build/+/1885408

Change-Id: I7f75ba30cd5391aec23e525350bd3fc2fdf40d05
2021-11-10 17:52:22 +00:00
Tianjie Xu
bff0316e3c Merge "Fix python3 incompatiable code" am: 7a048996b7 am: 4d6bc649e8
Original change: https://android-review.googlesource.com/c/platform/build/+/1886461

Change-Id: Ic2eb5b60a57989960712dc975a1eea66b3e988a3
2021-11-10 17:42:20 +00:00
Treehugger Robot
ce754c6762 Merge changes from topic "soong-java-install" am: 585ec03c47 am: 7be9f15f4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1880594

Change-Id: I2cf1cc74ad59eaea3e93004a40511e4ffd721c2e
2021-11-10 17:41:24 +00:00
Anton Hansson
6537f5fc66 Merge "Fix product single value variables failed issue" am: 0e21221d30 am: 1564e90a14 am: ec88e00164
Original change: https://android-review.googlesource.com/c/platform/build/+/1885408

Change-Id: Ib8c1764ecf0553502e839430ca53570d54c1ce6c
2021-11-10 17:33:50 +00:00
Tianjie Xu
4d6bc649e8 Merge "Fix python3 incompatiable code" am: 7a048996b7
Original change: https://android-review.googlesource.com/c/platform/build/+/1886461

Change-Id: I40b3874d5efb550d2756cf528ca54c615e5d4804
2021-11-10 17:29:19 +00:00
Treehugger Robot
7be9f15f4b Merge changes from topic "soong-java-install" am: 585ec03c47
Original change: https://android-review.googlesource.com/c/platform/build/+/1880594

Change-Id: If2f69fcbaff7dcf4e50de6bae059a091ec18ca4d
2021-11-10 17:28:49 +00:00