Commit Graph

73986 Commits

Author SHA1 Message Date
Treehugger Robot
ad058b477b Merge "Fix small misuse of pass" am: f6cd3a1ddd am: 2238917d48
Original change: https://android-review.googlesource.com/c/platform/build/+/1976046

Change-Id: Iac45f0044bce25e539a5288bb81a2e11afda9c97
2022-02-08 04:23:52 +00:00
Treehugger Robot
2238917d48 Merge "Fix small misuse of pass" am: f6cd3a1ddd
Original change: https://android-review.googlesource.com/c/platform/build/+/1976046

Change-Id: I90547726772363a853bc5206093cf1f23ec2f030
2022-02-08 04:01:27 +00:00
Treehugger Robot
f6cd3a1ddd Merge "Fix small misuse of pass" 2022-02-08 03:42:12 +00:00
Kelvin Zhang
9d021e996b Fix small misuse of pass
The intention is to skip current iteration of for loop, so 'continue'
should be used instead of 'pass'

Test: th
Change-Id: Ic955beeaef74100981b351e2e7807c7fde538783
2022-02-07 16:38:09 -08:00
Kelvin Zhang
d5ab964e6b Merge "Store EROFS images uncompressed" am: 691f8b93c7 am: 828c68767e
Original change: https://android-review.googlesource.com/c/platform/build/+/1956494

Change-Id: I0adc01c3080f7aba94b48603fa2b1fe4f5212bc5
2022-02-07 21:33:22 +00:00
Kelvin Zhang
828c68767e Merge "Store EROFS images uncompressed" am: 691f8b93c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1956494

Change-Id: I8736cc954ce7c9fdde596c55c52e38410d306fe1
2022-02-07 21:14:15 +00:00
Kelvin Zhang
691f8b93c7 Merge "Store EROFS images uncompressed" 2022-02-07 20:55:51 +00:00
Jordan Demeulenaere
95e64151be Merge "Revert "Add a core configuration that disables the zygote."" am: d183371cda am: c21bcf2636
Original change: https://android-review.googlesource.com/c/platform/build/+/1974419

Change-Id: I34d13158362a27138c99e5b05e50a049dd4ebd43
2022-02-07 15:24:04 +00:00
Jordan Demeulenaere
c21bcf2636 Merge "Revert "Add a core configuration that disables the zygote."" am: d183371cda
Original change: https://android-review.googlesource.com/c/platform/build/+/1974419

Change-Id: I298b4740a81d4219554ac0bbfa6683fbbd84c300
2022-02-07 15:09:14 +00:00
Jordan Demeulenaere
d183371cda Merge "Revert "Add a core configuration that disables the zygote."" 2022-02-07 14:53:40 +00:00
Jordan Demeulenaere
fe3d2e672a Revert "Add a core configuration that disables the zygote."
Revert submission 1964759-master-I4f918502e611e950fa039e4e2ed817c97b928ba2

Reason for revert: b/217993447
Reverted Changes:
I4f918502e:Add a core configuration that disables the zygote....
I4f918502e:Add a core configuration that disables the zygote....
I4f918502e:Add a core configuration that disables the zygote....

Change-Id: I5d51a021fea89a0ab6c73349d93117d60cfc9350
2022-02-07 09:05:29 +00:00
Treehugger Robot
abbe220629 Merge "Add a core configuration that disables the zygote." am: fb9ec40e65 am: ea27a5efb7
Original change: https://android-review.googlesource.com/c/platform/build/+/1964621

Change-Id: Id82b621d622f3f8076f14a9c46321787350a25d1
2022-02-05 00:25:44 +00:00
Treehugger Robot
ea27a5efb7 Merge "Add a core configuration that disables the zygote." am: fb9ec40e65
Original change: https://android-review.googlesource.com/c/platform/build/+/1964621

Change-Id: Ie3be954457563358580d9af2fabcf69559566458
2022-02-05 00:09:39 +00:00
Treehugger Robot
fb9ec40e65 Merge "Add a core configuration that disables the zygote." 2022-02-04 23:52:33 +00:00
Bob Badour
1dca1af739 Merge "Regularize command-line flags." am: 339edb60d2 am: 00e438dd74
Original change: https://android-review.googlesource.com/c/platform/build/+/1969760

Change-Id: Ib85eb5b7fda18d0e47147c1ca6e7dff1f273638a
2022-02-03 04:06:11 +00:00
Bob Badour
00e438dd74 Merge "Regularize command-line flags." am: 339edb60d2
Original change: https://android-review.googlesource.com/c/platform/build/+/1969760

Change-Id: Idfddaa7a9fe398734278e0d889108becb63f4e59
2022-02-03 03:48:40 +00:00
Kelvin Zhang
b748ae9f86 Merge "Add zhangkelvin@ as owner for release tools scripts" am: 3b72e28421 am: 075084d909
Original change: https://android-review.googlesource.com/c/platform/build/+/1969479

Change-Id: I29d4d21733d97ba3225f393fce76d23ddc808098
2022-02-03 03:36:31 +00:00
Bob Badour
55c9a6b19c Merge "license metadata xml notice files" am: a822469f2a am: ce5a9303ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1966147

Change-Id: Ib7298e85bf82ed3643d0fb5233c62e2286543f37
2022-02-03 03:35:52 +00:00
Bob Badour
339edb60d2 Merge "Regularize command-line flags." 2022-02-03 03:29:20 +00:00
Kelvin Zhang
075084d909 Merge "Add zhangkelvin@ as owner for release tools scripts" am: 3b72e28421
Original change: https://android-review.googlesource.com/c/platform/build/+/1969479

Change-Id: Id218861921c646bdc7df57758168c217be0b0fb7
2022-02-03 03:19:50 +00:00
Bob Badour
ce5a9303ac Merge "license metadata xml notice files" am: a822469f2a
Original change: https://android-review.googlesource.com/c/platform/build/+/1966147

Change-Id: If958a594814b9c06a817d3e4d02c3e7b5d45a4fa
2022-02-03 03:19:40 +00:00
Kelvin Zhang
3b72e28421 Merge "Add zhangkelvin@ as owner for release tools scripts" 2022-02-03 03:05:34 +00:00
Bob Badour
a822469f2a Merge "license metadata xml notice files" 2022-02-03 03:04:50 +00:00
Bob Badour
682e1bae57 Regularize command-line flags.
All the notice binaries have -title

All the binaries that can -stripPrefix can strip multiple.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m bom; out/soong/host/linux-x85/bom ...
Test: m dumpgraph; out/soong/host/linux-x85/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x85/dumpresolutions ...
Test: m htmlnotice; out/soong/host/linux-x85/htmlnotice ...
Test: m rtrace; out/soong/host/linux-x85/rtrace ...
Test: m textnotice; out/soong/host/linux-x85/textnotice ...
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

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: I08357bf1adb048abba6563cf3cea6ee6d60405e0
2022-02-02 15:32:50 -08:00
Bob Badour
f87922450e license metadata xml notice files
Introduce the below command-line tool:

xmlnotice outputs a NOTICE.xml file constructed from the license
texts of the transitive closure of dependencies.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

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: I267effd3a1c1b981bcdc5e058dce561a2d4a7948
2022-02-02 15:32:50 -08:00
Kelvin Zhang
834f5d458f Store EROFS images uncompressed
Test: th
Change-Id: I53005bee139079afe25da231ca1d42f03fa010a5
2022-02-02 12:52:34 -08:00
Kelvin Zhang
4f8f972a5b Add zhangkelvin@ as owner for release tools scripts
Change-Id: Ic861bc11d6a7d80c0d22a05ce35998753bb60752
2022-02-02 12:52:34 -08:00
Treehugger Robot
b4a4dee4c9 Merge "core & tools: system_dlkm: add dynamic partition" am: ef25de413e am: 0f5c34115c
Original change: https://android-review.googlesource.com/c/platform/build/+/1963868

Change-Id: I67f6f0e0c4e1946b1fdfc81b097a0566d54eb324
2022-02-02 06:39:10 +00:00
Treehugger Robot
0f5c34115c Merge "core & tools: system_dlkm: add dynamic partition" am: ef25de413e
Original change: https://android-review.googlesource.com/c/platform/build/+/1963868

Change-Id: Id6e2f44307b6f801056c704f4524d4c22d830623
2022-02-02 06:22:41 +00:00
Treehugger Robot
ef25de413e Merge "core & tools: system_dlkm: add dynamic partition" 2022-02-02 06:04:07 +00:00
Treehugger Robot
b41f62b0fe Merge "Add support for gzipping html output." am: 91e4f9db50 am: 7ceb15511b
Original change: https://android-review.googlesource.com/c/platform/build/+/1966146

Change-Id: Ib99ad444a37428fe8edacbe2f1b806918e78e130
2022-02-02 05:10:35 +00:00
Treehugger Robot
7ceb15511b Merge "Add support for gzipping html output." am: 91e4f9db50
Original change: https://android-review.googlesource.com/c/platform/build/+/1966146

Change-Id: I8a8dde8f3ecab4012682359205b1ab63ea693db4
2022-02-02 04:45:35 +00:00
Treehugger Robot
91e4f9db50 Merge "Add support for gzipping html output." 2022-02-02 04:32:05 +00:00
Bob Badour
608bdff0a7 Add support for gzipping html output.
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m htmlnotice; out/soong/host/linux-x85/htmlnotice ...

where ... is -o=html.gz followed by the path to the .meta_lic file for
the system image. In my case if

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

the rest of ... can be expressed as:

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

Change-Id: I7a42d5186876609a401956754e3dcff64211fb15
2022-02-01 15:35:40 -08:00
Baligh Uddin
014b99ee06 Merge "Move pvmfw.img to PREBUILT_IMAGES temporarily" am: 1a95fc381c am: 4bfbb5f713
Original change: https://android-review.googlesource.com/c/platform/build/+/1966606

Change-Id: Ic1e70a2c26a807a48a8b965c4c6f2ad7681fc3e1
2022-02-01 20:28:04 +00:00
Baligh Uddin
fbbf9f3af1 Merge "Rename BUILT_PVMFWIMAGE_TARGET to PREBUILT_..." am: ed1041b8a2 am: 54278d0d8d
Original change: https://android-review.googlesource.com/c/platform/build/+/1966609

Change-Id: I98b786f14f4b81c968aef597a934410d6d28a115
2022-02-01 20:27:48 +00:00
Baligh Uddin
4bfbb5f713 Merge "Move pvmfw.img to PREBUILT_IMAGES temporarily" am: 1a95fc381c
Original change: https://android-review.googlesource.com/c/platform/build/+/1966606

Change-Id: I4ad8a0bc119f35e1cd3aa207c8ce76b6f284e6dd
2022-02-01 20:09:53 +00:00
Baligh Uddin
54278d0d8d Merge "Rename BUILT_PVMFWIMAGE_TARGET to PREBUILT_..." am: ed1041b8a2
Original change: https://android-review.googlesource.com/c/platform/build/+/1966609

Change-Id: I34a6b6e6e505a6aac7fc835a7d9c9a9688ed9c41
2022-02-01 20:09:38 +00:00
Baligh Uddin
1a95fc381c Merge "Move pvmfw.img to PREBUILT_IMAGES temporarily" 2022-02-01 19:49:15 +00:00
Baligh Uddin
ed1041b8a2 Merge "Rename BUILT_PVMFWIMAGE_TARGET to PREBUILT_..." 2022-02-01 19:48:53 +00:00
Pierre-Clément Tosi
4bbb8dd86d Move pvmfw.img to PREBUILT_IMAGES temporarily
Move the image to PREBUILT_IMAGES to avoid breaking release key signing.

Bug: 216975821
Test: -
Change-Id: I686c6fec73a8383c10b17ab2af90767311cbae78
2022-02-01 15:06:26 +01:00
Pierre-Clément Tosi
37aa7e48c2 Rename BUILT_PVMFWIMAGE_TARGET to PREBUILT_...
Avoid the name as it is currently confusing given that we're not
actually building the image.

Bug: 216975821
Test: -
Change-Id: Ifac7047e72f590d6acb3997efa20f5f348e39491
2022-02-01 15:06:19 +01:00
Treehugger Robot
d7c4f72b58 Merge changes I40a05866,Id3d6e701 am: 6ebf02914c am: b70dd510cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1966104

Change-Id: I43542df3f9b4f4e174a0be446a4ba01e777d0e25
2022-02-01 02:01:55 +00:00
Treehugger Robot
b70dd510cc Merge changes I40a05866,Id3d6e701 am: 6ebf02914c
Original change: https://android-review.googlesource.com/c/platform/build/+/1966104

Change-Id: Id7a30b9c88b1e971914b501a22fe5a7ead4a4531
2022-02-01 01:45:44 +00:00
Treehugger Robot
6ebf02914c Merge changes I40a05866,Id3d6e701
* changes:
  license metadata reverse trace
  Fix copy+paste error.
2022-02-01 01:25:59 +00:00
Treehugger Robot
89351613a6 Merge "Track dependencies when reading notice files" am: 133e2651a5 am: 258a183c36
Original change: https://android-review.googlesource.com/c/platform/build/+/1965959

Change-Id: I2ef9cda824a5500a26b9f027882715a71268a1ca
2022-02-01 00:03:25 +00:00
Treehugger Robot
258a183c36 Merge "Track dependencies when reading notice files" am: 133e2651a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1965959

Change-Id: I13f0546d106815e1b1d92aedf2b6df7186b8b4c9
2022-01-31 23:45:11 +00:00
Treehugger Robot
133e2651a5 Merge "Track dependencies when reading notice files" 2022-01-31 23:34:59 +00:00
Bob Badour
c817845ea5 license metadata reverse trace
Introduce the below command-line tool:

rtrace outputs a list of targets and conditions causing one or more
projects or target nodes to require sharing to resolve a restricted
condition.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m rtrace; out/soong/host/linux-x85/rtrace -rtrace=...

where ... is a project or license metadata file followed by 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:

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

Change-Id: I40a0586699d9b8a8dd2bd4ba26756c9649ebf964
2022-01-31 14:16:23 -08:00
Bob Badour
91af68b1e1 Fix copy+paste error.
The tool under test is dumpresolutions not listshare.

Test: m dumpresolutions; out/soong/host/linux-x85/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: Id3d6e701ebd3dab03f407116d85a5e2aab8c5c59
2022-01-31 14:14:27 -08:00