Commit Graph

7575 Commits

Author SHA1 Message Date
Treehugger Robot
7d4cef0038 Merge "Track dependencies when reading notice files" am: 133e2651a5 am: 258a183c36 am: 89351613a6 am: 865cfd6f1d
Original change: https://android-review.googlesource.com/c/platform/build/+/1965959

Change-Id: I9fa36225ceecbed4f80b36d96dbfffc2d6267df2
2022-02-01 00:31:55 +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
Colin Cross
bb45f8c74d Track dependencies when reading notice files
Track which files are read by the notice file indexer and add a flag
to textnotice and htmlnotice to support writing them out.

Bug: 207445310
Test: textnotice_test
Test: htmlnotice_test
Change-Id: Ib74706b8a87a5ed9268a0fe37982ecf89f4e227d
2022-01-31 10:15:10 -08:00
Ramji Jiyani
13a4137929 core & tools: system_dlkm: add dynamic partition
Converts existing static partition support to a
dynamic partition.

Bug: 200082547
Test: TH
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: Ifd6d0c2a04e947b16f8b241e99cca594a1d315ae
2022-01-30 08:43:08 +00:00
Colin Cross
c69ec8cfd0 Merge changes I3db6310e,I061be2b9,I7e81936d,If0684cf1,I404b138f am: e4442b7df6 am: 07da3e7574 am: 16cb1328e7 am: d67b1659c8
Original change: https://android-review.googlesource.com/c/platform/build/+/1964245

Change-Id: If1e08f2f44ac4c005b5ec5949db72c73eb413c98
2022-01-28 22:37:26 +00:00
Colin Cross
e4442b7df6 Merge changes I3db6310e,I061be2b9,I7e81936d,If0684cf1,I404b138f
* changes:
  Move compliance commands into subdirectories
  Give compliance a pkgPath
  Move policy subdirectory into package directory
  Fix errors caught by go vet in compliance package
  Run gofmt on compliance
2022-01-28 21:24:26 +00:00
Bob Badour
e38d5263af Merge changes I73975ca7,I98e2c1ee am: d8724181a9 am: 35c48f5509 am: 4a5209b12f am: 00e51b7f7e
Original change: https://android-review.googlesource.com/c/platform/build/+/1962162

Change-Id: Iec834738fd8bd7000b82744f0e14877139f398b9
2022-01-28 05:13:16 +00:00
Treehugger Robot
bd51b1b8c3 Merge "license metadata html notice files" am: b816e5863d am: 8f1df28b44 am: c8e11f32ec am: b64c3e2428
Original change: https://android-review.googlesource.com/c/platform/build/+/1958311

Change-Id: I4c714eaf92439c96e8723efa1ca4854422f2ab26
2022-01-28 05:12:28 +00:00
Bob Badour
d8724181a9 Merge changes I73975ca7,I98e2c1ee
* changes:
  license metadata bill of materials list
  license metadata shipped libraries list
2022-01-28 04:09:05 +00:00
Treehugger Robot
b816e5863d Merge "license metadata html notice files" 2022-01-28 03:59:51 +00:00
Colin Cross
d0f05c9eda Move compliance commands into subdirectories
Move each compliance command into its own directory to avoid Go tooling
considering all the files to be a single package and complaining about
conflicting global names.

Test: go test ./...
Change-Id: I3db6310e7368bcc7fe6a3704b40a84078ed44209
2022-01-27 17:14:03 -08:00
Colin Cross
38a6193180 Give compliance a pkgPath
Change the pkgPath of compliance to android/soong/tools/compliance
to distinguish it from the standard library.

Also add a go.mod file so that the Go tools can find the package.

Test: go test ./...
Change-Id: I061be2b91378db6508e9c88be2548648af8be4e7
2022-01-27 17:14:03 -08:00
Colin Cross
2c51bd1d49 Move policy subdirectory into package directory
Go's tooling expects that all files in the same package are in the
same directory.  Move the policy/*.go files to policy_*.go.

Test: go test ./...
Change-Id: I7e81936ddd20a5ffb4770ae23bdb6e411d6924cc
2022-01-27 17:14:03 -08:00
Colin Cross
179ec3e55e Fix errors caught by go vet in compliance package
`go test` implicitly runs `go vet` and fails the tests if vet
errors are found.  Fix all the issues found by vet.

Test: go test build/make/tools/compliance/...
Change-Id: If0684cf124ece4931af440008cd44a61c22de475
2022-01-27 17:14:02 -08:00
Colin Cross
35f79c37aa Run gofmt on compliance
Test: builds
Change-Id: I404b138faac0db9a92201be6163b19d9e6bff810
2022-01-27 17:14:02 -08:00
Treehugger Robot
f0428bc950 Merge "license metadata text notice files" am: 29429f928f am: 00e74378d4 am: 3a9201e091 am: dd8257e6ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1917693

Change-Id: Ieb06e84e8c41355953d827fc94eab6bfad879485
2022-01-28 01:11:38 +00:00
Treehugger Robot
be522dbbfd Merge "Add a version code and version name to fsverity manifest APK" am: 766c5343e2 am: ff606ad9b6 am: 48e67cefd1 am: bf6c2242c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1963641

Change-Id: Idc78b8c7553b47d52b08f20225079bc87181ca1f
2022-01-28 01:11:15 +00:00
Treehugger Robot
29429f928f Merge "license metadata text notice files" 2022-01-28 00:23:47 +00:00
Treehugger Robot
766c5343e2 Merge "Add a version code and version name to fsverity manifest APK" 2022-01-27 23:48:24 +00:00
Treehugger Robot
684c7fd0e5 Merge "Fix bug where VABC xor is used on unsupported builds" am: c1edfc3b29 am: ea01d07642 am: e72c026778 am: d6ec917385
Original change: https://android-review.googlesource.com/c/platform/build/+/1961565

Change-Id: I6ae3bae4ce2e37961e039de50da114b4d54a80e9
2022-01-27 23:36:35 +00:00
Treehugger Robot
522fb21391 Merge "Skip generating care_map for non-AB updates" am: e3935dd7f0 am: f0dbde9990 am: bbedf706bc am: 78bc0850aa
Original change: https://android-review.googlesource.com/c/platform/build/+/1963386

Change-Id: I6f5b35dd4292b4e199ca3fcddbeeb5e899491590
2022-01-27 23:36:17 +00:00
Treehugger Robot
c1edfc3b29 Merge "Fix bug where VABC xor is used on unsupported builds" 2022-01-27 22:30:57 +00:00
Colin Cross
658172d982 Add a version code and version name to fsverity manifest APK
The post-build signing step expects to find a version code in every
APK, add the version code and version name.

Bug: 216584708
Test: manual
Change-Id: Ic43730df50ef32611d5b4159b46c8bbf9906e009
2022-01-27 12:46:22 -08:00
Iavor-Valentin Iftime
b837b7170b Skip generating care_map for non-AB updates
Bug: 186097910
Test: build a non-AB update merged target using Forrest,
      No errors reported and no META/care_map.pb is generated.

Change-Id: I74990b0aa7f46d4c4d40098a4b102f7e04166c39
2022-01-27 18:35:43 +00:00
Kelvin Zhang
f175801f62 Fix bug where VABC xor is used on unsupported builds
Test: th
Bug: 216426344
Change-Id: I352136eb5f261ee1ca1567530109e7623c5f978b
2022-01-27 10:23:10 -08:00
Bob Badour
2546febca7 license metadata bill of materials list
Introduce the below command-line tool:

bom outputs a text file listing 1 installed path per line.

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 ...

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: I73975ca7b161945a62ff83888527ce01fb47d75a
2022-01-26 20:58:24 -08:00
Bob Badour
00c8a38714 license metadata shipped libraries list
Introduce the below command-line tool:

shippedlibs outputs a text file listing 1 library per line containing
the libraries the shipped image is derived from.

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

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

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: I98e2c1eec94ad7878e911eee2458a26e12ee2b19
2022-01-26 17:21:39 -08:00
Bob Badour
6ea1457c9b license metadata html notice files
Introduce the below command-line tool:

htmlnotice outputs a NOTICE.html 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 htmlnotice; out/soong/host/linux-x85/htmlnotice ...

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: Idbbeb2939d8cbf497237516fe468004fcd2d72a1
2022-01-26 16:02:17 -08:00
Bob Badour
e6fdd1403b license metadata text notice files
Introduce the below command-line tool:

textnotice outputs a NOTICE text 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 textnotice; out/soong/host/linux-x85/textnotice ...

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: Ia691869fd8e58ef008024f48c23b1a4b4435677a
2022-01-26 16:02:11 -08:00
Treehugger Robot
ad2dfe1304 Merge "releasetools: system_dlkm: add image to dist zip" am: ef8f4426ef am: e97ae10d73 am: 537cb49480 am: 0eba8f0757
Original change: https://android-review.googlesource.com/c/platform/build/+/1958309

Change-Id: I1e3c9f5e896b87ca48deccc4619a352d133db467
2022-01-25 21:31:20 +00:00
Treehugger Robot
ef8f4426ef Merge "releasetools: system_dlkm: add image to dist zip" 2022-01-25 20:09:57 +00:00
Treehugger Robot
5b926eb43c Merge "Fix licenses and license texts." am: 24b74875e9 am: d2d11848b9 am: 5ca9df0edb am: 0fa6028384
Original change: https://android-review.googlesource.com/c/platform/build/+/1959641

Change-Id: Ie19ccfd29badf0ed43e033d8ea3403466b0ad329
2022-01-25 06:32:16 +00:00
Bob Badour
d2c7c08e7c Fix licenses and license texts.
Use Android-Apache-2.0 for all Apache 2.0

Remove legacy_restricted (no longer appears in code).

Remove Android.bp which did not build anything but was a placeholder
for the missing license texts.

Test: m nothing
Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-24 16:19:41 -08:00
Ramji Jiyani
bdef28f2ee releasetools: system_dlkm: add image to dist zip
Bug: 200082547
Test: Manual builds:
      1. Set BOARD_USES_SYSTEM_DLKM_PARTITION
      2. Set BOARD_PREBUILT_SYSTEM_DLKM_IMAGE to external image
      - Check that "m dist" put the system_dlkm image in
      out/dist/aosp_cf_x86_64_phone-img-eng.ramjiyani.zip
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I8b7dd40e178db7fe542253bff19040095847fa57
2022-01-24 21:27:52 +00:00
Chih-hung Hsieh
44fe96fdc1 Merge "Lower severity of 3 tidy warnings" am: 95ec3b899e am: 3ff26134dc am: c33c74dd00 am: db527f5ebe
Original change: https://android-review.googlesource.com/c/platform/build/+/1955365

Change-Id: Ia869a6be3aa6dec39ca4df71c3528d29238da064
2022-01-21 05:18:26 +00:00
Chih-Hung Hsieh
02f0df83fc Lower severity of 3 tidy warnings
* bcmp/bcopy/bzero are not insecureAPI on Android.
* Android projects may enable/disable clang-tidy checks locally;
  warn/*patterns.py keep global classification of all warnings.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I7720f7babd0a33c1b6602c9a8bb67565c45db94e
2022-01-20 16:13:12 -08:00
Treehugger Robot
15423781f6 Merge "Add erofs compressor type param" am: d698e3e0b0 am: 8988b57027 am: 0a697caa2b am: 6d70ba5041
Original change: https://android-review.googlesource.com/c/platform/build/+/1949257

Change-Id: If9adb8f042daad86245b1a2b900429c37b53cd4d
2022-01-19 03:37:07 +00:00
Treehugger Robot
b179f9e6cf Merge "Fix formatting error" am: 5d14dfa2fd am: c5f019bf71 am: 286491047d am: c717997920
Original change: https://android-review.googlesource.com/c/platform/build/+/1952324

Change-Id: I37cc4c3de15bf4a6508b46e72d3e233b068e3e81
2022-01-19 01:01:00 +00:00
Kelvin Zhang
988f92d7c5 Merge "Fix check_tf failure when duplicate package names are present" am: 4a376986ea am: 6a7d589ed2 am: 68b0980e5b am: 367d28b2c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1949256

Change-Id: I232a775698ab70b0bf0cddeee9af55cb8af2652e
2022-01-18 19:31:51 +00:00
Kelvin Zhang
6fe2fc031f Add erofs compressor type param
Test: th
Bug: 206729162
Change-Id: I3ddd1a55e1544a8a4d24ed445562f05ad0aaad2c
2022-01-18 10:17:49 -08:00
Kelvin Zhang
554c8bee14 Fix formatting error
Test: th
Bug: 214388458
Change-Id: I2dc72884aad4f440b4b68566e2e29f9f6f5aa73e
2022-01-18 10:17:49 -08:00
Kelvin Zhang
4a376986ea Merge "Fix check_tf failure when duplicate package names are present" 2022-01-18 18:14:02 +00:00
Treehugger Robot
e2b5582b7f Merge "Migrate java-event-logs-tags.py to python3." am: 6c38edc0b9 am: eb1391adb9 am: e330539009 am: d4df224693
Original change: https://android-review.googlesource.com/c/platform/build/+/1948776

Change-Id: I039c3c56de57f6ec040499e0d7089bcd8b4638d8
2022-01-18 11:52:25 +00:00
Jingwen Chen
2a31f3df87 Migrate java-event-logs-tags.py to python3.
These are used in the Bazel Android app builds.

Test: m droid
Test: CI
Test: b run //build/make/tools:java-event-log-tags

Change-Id: Iaffe6f974008d1a0532a849353d25df02197afd2
2022-01-17 13:02:53 +00:00
Yi-yo Chiang
14d0e73497 Merge changes from topic "gki-avb-vts" am: 8b4e2fd6c0 am: b45caeb134 am: f2c62d7ddb am: e3874400a1
Original change: https://android-review.googlesource.com/c/platform/build/+/1941496

Change-Id: I252c986a2e0a15df168a14ac4d31f19f9f0dc19b
2022-01-17 05:51:06 +00:00
Yi-yo Chiang
8b4e2fd6c0 Merge changes from topic "gki-avb-vts"
* changes:
  releasetools: Android T GKI certification scheme
  Android T GKI certification scheme
2022-01-17 04:52:28 +00:00
Yi-Yo Chiang
36054e2daf releasetools: Android T GKI certification scheme
Companion change of Iaf48a6e3d4b97fa6bfb5e1635a288b045baa248f
To support new GKI certification scheme for boot.img and
init_boot.img on upgrading and launching device combinations.

Bug: 210367929
Bug: 211741246
Bug: 203698939
Test: atest --host releasetools_test:test_common
Test: unpack_bootimg --boot_img boot.img
Test: unpack_bootimg --boot_img init_boot.img
Test: avbtool info_image --image out/boot_signature
Change-Id: I3749297c09c3899046550e4be776acbeea37ef2e
2022-01-14 19:50:32 +08:00
Treehugger Robot
bd1b5694fd Merge "Add option to enable lz4diff" am: 2f1f985480 am: 3187ce1680 am: b89cd6aad3 am: 8a1662d71c
Original change: https://android-review.googlesource.com/c/platform/build/+/1944184

Change-Id: I2adfe5357fec0cedf58393b6922d3aa116f472ec
2022-01-13 21:19:31 +00:00
Treehugger Robot
2f1f985480 Merge "Add option to enable lz4diff" 2022-01-13 20:33:31 +00:00