Commit Graph

77178 Commits

Author SHA1 Message Date
Treehugger Robot
192875fdfc Merge "Regression testcase for shipped vs nonshipped." am: 3a0656307c
Original change: https://android-review.googlesource.com/c/platform/build/+/1946016

Change-Id: I1e37a97e0600ee5155de3ca2b5a0bc8baa367bf6
2022-01-12 23:58:16 +00:00
Treehugger Robot
3a0656307c Merge "Regression testcase for shipped vs nonshipped." 2022-01-12 23:35:17 +00:00
Treehugger Robot
e74a41a8b9 Merge "Fix typo in doc: code segment for container dot" am: 710813e871 am: 1dd148f737 am: f79ab4b3a3 am: 00195a11bf
Original change: https://android-review.googlesource.com/c/platform/build/+/1946012

Change-Id: I7a4dc7026406c3e9adb8a17d79c369556a04349e
2022-01-12 23:27:18 +00:00
Treehugger Robot
00195a11bf Merge "Fix typo in doc: code segment for container dot" am: 710813e871 am: 1dd148f737 am: f79ab4b3a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1946012

Change-Id: I116e98e94d842b47218f8d90cdb4e0c147aa0a38
2022-01-12 23:14:25 +00:00
Treehugger Robot
f79ab4b3a3 Merge "Fix typo in doc: code segment for container dot" am: 710813e871 am: 1dd148f737
Original change: https://android-review.googlesource.com/c/platform/build/+/1946012

Change-Id: Idc041eef65d8fad116f2b10274c63c0fac575b7e
2022-01-12 23:02:18 +00:00
Treehugger Robot
1dd148f737 Merge "Fix typo in doc: code segment for container dot" am: 710813e871
Original change: https://android-review.googlesource.com/c/platform/build/+/1946012

Change-Id: Ib88413400876e27177f087135045c0896191173e
2022-01-12 22:45:54 +00:00
Treehugger Robot
710813e871 Merge "Fix typo in doc: code segment for container dot" 2022-01-12 22:31:40 +00:00
Treehugger Robot
f935c8b4c2 Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" am: 49c9d1867a am: 4a1fbf832d am: 3c2b365e23 am: a45477cc11
Original change: https://android-review.googlesource.com/c/platform/build/+/1941098

Change-Id: Iefdb3e7fb3bb7b5b10460bceb92b42bb140351b7
2022-01-12 22:09:16 +00:00
Treehugger Robot
a45477cc11 Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" am: 49c9d1867a am: 4a1fbf832d am: 3c2b365e23
Original change: https://android-review.googlesource.com/c/platform/build/+/1941098

Change-Id: Ibefbe52bd7c4d85ab89521f37acd8f0874061313
2022-01-12 21:56:01 +00:00
Treehugger Robot
3c2b365e23 Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" am: 49c9d1867a am: 4a1fbf832d
Original change: https://android-review.googlesource.com/c/platform/build/+/1941098

Change-Id: Id484f0cced953a4a94dc45f07963562e90025d8a
2022-01-12 21:35:59 +00:00
Treehugger Robot
4a1fbf832d Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" am: 49c9d1867a
Original change: https://android-review.googlesource.com/c/platform/build/+/1941098

Change-Id: I824aa918ecb5d27f2d8ecff93cc4bc9f5c7701a5
2022-01-12 21:13:37 +00:00
Treehugger Robot
49c9d1867a Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" 2022-01-12 20:55:38 +00:00
Frank Wang
3f7acd943c Add com.android.auxiliary to base_system.mk
Test: loaded to an AVD
Bug: b/210728915
Change-Id: Ic9f6592ccaf02ca56147f8386da5c9e3a8085005
2022-01-12 06:14:09 +00:00
Treehugger Robot
4e65ca2810 Merge "Updates OWNERS file" am: 35efbedb4f am: dd52cdce2e am: 14e6ca5053 am: 806c252953
Original change: https://android-review.googlesource.com/c/platform/build/+/1944687

Change-Id: I92caae9c5bfbfb0fc74c6cd52b916cf5724df4e9
2022-01-12 04:51:38 +00:00
Treehugger Robot
806c252953 Merge "Updates OWNERS file" am: 35efbedb4f am: dd52cdce2e am: 14e6ca5053
Original change: https://android-review.googlesource.com/c/platform/build/+/1944687

Change-Id: I34fbfa9fe76da1688a6b680d80de8a2a3fae5bf5
2022-01-12 04:32:54 +00:00
Treehugger Robot
14e6ca5053 Merge "Updates OWNERS file" am: 35efbedb4f am: dd52cdce2e
Original change: https://android-review.googlesource.com/c/platform/build/+/1944687

Change-Id: I52e51587591a92a0c778ea664955086dd5e985f0
2022-01-12 04:15:49 +00:00
Treehugger Robot
dd52cdce2e Merge "Updates OWNERS file" am: 35efbedb4f
Original change: https://android-review.googlesource.com/c/platform/build/+/1944687

Change-Id: I531cbf616de14aa699275db1097aa33c7d5afda9
2022-01-12 03:57:51 +00:00
Treehugger Robot
35efbedb4f Merge "Updates OWNERS file" 2022-01-12 03:37:34 +00:00
Treehugger Robot
adf5feeda2 Merge changes Ia2ec1b81,Ibc831ae8 am: 49380ebecf am: 5955f8a521 am: 4817ded07b am: 2e04c83b6b
Original change: https://android-review.googlesource.com/c/platform/build/+/1941454

Change-Id: I54efe335ac9d3ceea817c176872249be701900f4
2022-01-12 01:41:09 +00:00
Treehugger Robot
022e8e293f Merge "Fold annotations." am: b3f3e7b3f7 am: e27ecb85d4 am: b878b8ff56 am: 04b2d70747
Original change: https://android-review.googlesource.com/c/platform/build/+/1944765

Change-Id: Ie95025ef51be307a97b699d8659e91036fd0525d
2022-01-12 01:40:48 +00:00
Treehugger Robot
2e04c83b6b Merge changes Ia2ec1b81,Ibc831ae8 am: 49380ebecf am: 5955f8a521 am: 4817ded07b
Original change: https://android-review.googlesource.com/c/platform/build/+/1941454

Change-Id: I7f5fca634d6cba05b3cde94502aef1e6df6a2f71
2022-01-12 01:20:59 +00:00
Treehugger Robot
04b2d70747 Merge "Fold annotations." am: b3f3e7b3f7 am: e27ecb85d4 am: b878b8ff56
Original change: https://android-review.googlesource.com/c/platform/build/+/1944765

Change-Id: I479e77a37ff9b62887f45b2880f1e8a12b9a0fb4
2022-01-12 01:20:50 +00:00
Treehugger Robot
4817ded07b Merge changes Ia2ec1b81,Ibc831ae8 am: 49380ebecf am: 5955f8a521
Original change: https://android-review.googlesource.com/c/platform/build/+/1941454

Change-Id: I63b78b94f3b39f72935413e77e7fdc887fbc6ae2
2022-01-12 01:00:09 +00:00
Treehugger Robot
b878b8ff56 Merge "Fold annotations." am: b3f3e7b3f7 am: e27ecb85d4
Original change: https://android-review.googlesource.com/c/platform/build/+/1944765

Change-Id: I596d2bfe32bbb85091f39b2a11068e27734ed9ad
2022-01-12 00:59:58 +00:00
Treehugger Robot
5955f8a521 Merge changes Ia2ec1b81,Ibc831ae8 am: 49380ebecf
Original change: https://android-review.googlesource.com/c/platform/build/+/1941454

Change-Id: I30c59129aa0eb623657c752f6b25679ef6270603
2022-01-12 00:46:29 +00:00
Treehugger Robot
e27ecb85d4 Merge "Fold annotations." am: b3f3e7b3f7
Original change: https://android-review.googlesource.com/c/platform/build/+/1944765

Change-Id: I46f99a9ce4d198ea8a88bb86feff52b913761fa8
2022-01-12 00:46:15 +00:00
Bob Badour
00bf3d9b29 Regression testcase for shipped vs nonshipped.
Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m listshare; out/soong/host/linux-x86/bin/listshare ...
Test: m checkshare; out/soong/host/linux-x86/bin/checkshare ...
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I17221ec8fe429b5f745c0733f8bb1ab0ea2f4567
2022-01-11 16:38:55 -08:00
Treehugger Robot
49380ebecf Merge changes Ia2ec1b81,Ibc831ae8
* changes:
  Performance and scale.
  Use struct{}
2022-01-12 00:27:41 +00:00
Treehugger Robot
b3f3e7b3f7 Merge "Fold annotations." 2022-01-12 00:27:35 +00:00
Treehugger Robot
e165f3e2df Merge "Remove win_sdk" am: d6bdfb3993 am: 9bc76efb0c am: ff5f9c27aa am: ecb58be871
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: Ica48f449f3fc29d9732c015bcb3ffa1d0f9cd0a1
2022-01-11 23:36:27 +00:00
Treehugger Robot
ecb58be871 Merge "Remove win_sdk" am: d6bdfb3993 am: 9bc76efb0c am: ff5f9c27aa
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: I1440b9ec6e658f50803113f082ddd651b22f80d1
2022-01-11 23:22:57 +00:00
Treehugger Robot
ff5f9c27aa Merge "Remove win_sdk" am: d6bdfb3993 am: 9bc76efb0c
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: Id7a09731d90cae8869ea29327887cd650a086b07
2022-01-11 23:07:48 +00:00
Treehugger Robot
9bc76efb0c Merge "Remove win_sdk" am: d6bdfb3993
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: I0e251ec112696dbe5d040fd7c19d64d20b03ba51
2022-01-11 22:50:33 +00:00
Bob Badour
99dba55b4b Fix typo in doc: code segment for container dot
Test: not applicable
Change-Id: Ibaadc6e8fd4a267b50a46feb2dd6278ff1f5ace1
2022-01-11 14:46:22 -08:00
Treehugger Robot
d6bdfb3993 Merge "Remove win_sdk" 2022-01-11 22:25:02 +00:00
Bob Badour
103eb0f9bc Performance and scale.
Defer edge creation.

Don't create edges until the count is known to avoid repeated allocate+
copy operatios.

Limit resolutions.

Allow only a single resolution condition set per target, and overwrite
intermediate results. Reduces memory and obviates allocations.

Propagate fewer conditions.

Instead of propagating notice conditions to parents in graph during
initial resolve, leave them on leaf node, and attach to ancestors in
the final walk. Reduces copies.

Parallelize resolutions.

Use goroutines, mutexes, and waitgroups to resolve branches of the
graph in parallel. Makes better use of available cores.

Don't accumulate resolutions inside non-containers.

During the final resolution walk, only attach actions to ancestors from
the root down until the 1st non-aggregate. Prevents an explosion of
copies in the lower levels of the graph.

Drop origin for scale.

Tracking the origin of every potential origin for every restricted
condition does not scale. By dropping origin, propagating from top
to bottom can prune many redundant paths avoiding an exponential
explosion.

Conditions as bitmask.

Use bit masks for license conditions and condition sets. Reduces maps
and allocations.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m listshare; out/soong/host/linux-x86/bin/listshare ...
Test: m checkshare; out/soong/host/linux-x86/bin/checkshare ...
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: Ia2ec1b818de6122c239fbd0824754f1d65daffd3
2022-01-11 10:40:50 -08:00
Bob Badour
5446a6f8e1 Use struct{}
Using struct{}{} as the payload for set maps reduces memory use for
large sets.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m listshare; out/soong/host/linux-x86/bin/listshare ...
Test: m checkshare; out/soong/host/linux-x86/bin/checkshare ...
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: Ibc831ae80fc50f35e1000348fb28fc0167d0ebed
2022-01-11 10:40:50 -08:00
Bob Badour
67d8ae390a Fold annotations.
Use annotation slices looked up from map instead of read from disk to
reduce copies.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m listshare; out/soong/host/linux-x86/bin/listshare ...
Test: m checkshare; out/soong/host/linux-x86/bin/checkshare ...
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: Ibf6f7d319092e0d54ab451ffbbd35dcd7d0080e0
2022-01-11 10:40:39 -08:00
Cole Faust
fdc2cd300e Remove win_sdk
win_sdk is deprecated, if given on the command line
sdk will be build instead.

Bug: 212724080
Test: Presubmits
Change-Id: Ib3bd51923142b00100b49585ad88bc1292da2463
2022-01-11 10:31:11 -08:00
Treehugger Robot
20151024e0 [automerger skipped] Merge "Make com.android.sepolicy mandatory" am: 7297032a8d am: 316b3b71e0 am: 50c9214e69 am: ce1c150981 -s ours
am skip reason: Merged-In I23599517b427363e758e6f06763079cc1482cb47 with SHA-1 2e272df576 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1924017

Change-Id: I844ac5389430bf2939ca4b269cd6bba9d6b9f7c0
2022-01-11 15:16:52 +00:00
Treehugger Robot
ce1c150981 Merge "Make com.android.sepolicy mandatory" am: 7297032a8d am: 316b3b71e0 am: 50c9214e69
Original change: https://android-review.googlesource.com/c/platform/build/+/1924017

Change-Id: Ie2adfb4f6417a568cc2e31d404418e69d620f19e
2022-01-11 14:59:30 +00:00
Treehugger Robot
50c9214e69 Merge "Make com.android.sepolicy mandatory" am: 7297032a8d am: 316b3b71e0
Original change: https://android-review.googlesource.com/c/platform/build/+/1924017

Change-Id: I34231dc679c64ec6e59b4852a25b8ab29616d313
2022-01-11 14:48:11 +00:00
Treehugger Robot
316b3b71e0 Merge "Make com.android.sepolicy mandatory" am: 7297032a8d
Original change: https://android-review.googlesource.com/c/platform/build/+/1924017

Change-Id: I4844fba5449cd2801f052ee160c071250c209a0a
2022-01-11 14:31:00 +00:00
Treehugger Robot
7297032a8d Merge "Make com.android.sepolicy mandatory" 2022-01-11 14:11:37 +00:00
Yi-Yo Chiang
f282f5521d Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST
Right now if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST is given,
  $ m dist bootimage
would copy boot*.img to the dist dir.

After this change, both
  $ m dist  # droidcore
  $ m dist bootimage
would copy boot*.img to the dist dir, the difference is that the latter
builds & copies *only* the boot images.

Bug: 212486689
Test: m dist bootimage
Test: m dist => boot*.img are copied to dist dir
Change-Id: I1c714ce5d75eba93e32078b1ac291a181b05405a
2022-01-11 17:31:16 +08:00
Yi-yo Chiang
c23d3f78ad Merge "Fix init_boot partition AVB signing" am: 27a309f627 am: 85128a7fa0 am: d31e97cc6d am: 3d4a988016
Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I0f88b613396e0eef971b5c42f7aa5888b31fa9c1
2022-01-11 08:12:12 +00:00
Yi-yo Chiang
3d4a988016 Merge "Fix init_boot partition AVB signing" am: 27a309f627 am: 85128a7fa0 am: d31e97cc6d
Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I411a13d03f03f0271e434adaebf1157617cbf581
2022-01-11 07:49:54 +00:00
Yi-yo Chiang
d31e97cc6d Merge "Fix init_boot partition AVB signing" am: 27a309f627 am: 85128a7fa0
Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I4330eb68f30d31fa74c4e0f9bf980d1768776928
2022-01-11 07:37:07 +00:00
Yi-yo Chiang
85128a7fa0 Merge "Fix init_boot partition AVB signing" am: 27a309f627
Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I1f05d1029f0dda093ae32cfe1f8bfe1cbe34e1d5
2022-01-11 07:19:05 +00:00
Treehugger Robot
28e245f711 Merge "Do not append .meta_lic to meta_lic" am: 9d83209f12 am: 0f12de8954 am: 9212d765d1 am: 4250af6e75
Original change: https://android-review.googlesource.com/c/platform/build/+/1944764

Change-Id: I9f7a7d1824bd2ac198b34a26a61537e4c6242000
2022-01-11 07:17:58 +00:00