Commit Graph

77178 Commits

Author SHA1 Message Date
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
dd8257e6ad Merge "license metadata text notice files" am: 29429f928f am: 00e74378d4 am: 3a9201e091
Original change: https://android-review.googlesource.com/c/platform/build/+/1917693

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

Change-Id: Ic08b64ff76ac5ef92e6cdcad4d50de67f1e1dd9e
2022-01-28 00:53:18 +00:00
Treehugger Robot
3a9201e091 Merge "license metadata text notice files" am: 29429f928f am: 00e74378d4
Original change: https://android-review.googlesource.com/c/platform/build/+/1917693

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

Change-Id: I20237ad2f16d1857b2e0718c20688a230f14cec4
2022-01-28 00:36:23 +00:00
Treehugger Robot
00e74378d4 Merge "license metadata text notice files" am: 29429f928f
Original change: https://android-review.googlesource.com/c/platform/build/+/1917693

Change-Id: I41e85e9fa0c7634ab128162267b3140e140c1cbd
2022-01-28 00:24:22 +00:00
Treehugger Robot
29429f928f Merge "license metadata text notice files" 2022-01-28 00:23:47 +00:00
Treehugger Robot
ff606ad9b6 Merge "Add a version code and version name to fsverity manifest APK" am: 766c5343e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1963641

Change-Id: Ib4bc27b4127c8630da61196ebdaec55d506aa709
2022-01-28 00:18:24 +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
d6ec917385 Merge "Fix bug where VABC xor is used on unsupported builds" am: c1edfc3b29 am: ea01d07642 am: e72c026778
Original change: https://android-review.googlesource.com/c/platform/build/+/1961565

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

Change-Id: Iea6850acc0bbb9f010e1b5fca43d46816c7a016e
2022-01-27 23:18:25 +00:00
Treehugger Robot
e72c026778 Merge "Fix bug where VABC xor is used on unsupported builds" am: c1edfc3b29 am: ea01d07642
Original change: https://android-review.googlesource.com/c/platform/build/+/1961565

Change-Id: I6d88160d5019f9418b6730dcd4a3cfb9e7ff4b15
2022-01-27 23:05:26 +00:00
Treehugger Robot
bbedf706bc Merge "Skip generating care_map for non-AB updates" am: e3935dd7f0 am: f0dbde9990
Original change: https://android-review.googlesource.com/c/platform/build/+/1963386

Change-Id: I97cdfad6dcd928569ead0f0d21dd02b66068b3fe
2022-01-27 23:03:15 +00:00
Frank Wang
cc3d276278 Merge "Revert^2 "Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS"" 2022-01-27 22:45:08 +00:00
Treehugger Robot
ea01d07642 Merge "Fix bug where VABC xor is used on unsupported builds" am: c1edfc3b29
Original change: https://android-review.googlesource.com/c/platform/build/+/1961565

Change-Id: I61de9fb2b10aacfca647d48b3a4a38cdac5e1435
2022-01-27 22:37:28 +00:00
Treehugger Robot
f0dbde9990 Merge "Skip generating care_map for non-AB updates" am: e3935dd7f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1963386

Change-Id: I745746f2ae49fdfea554dc3ccd1f33caa60ac5b4
2022-01-27 22:37:18 +00:00
Treehugger Robot
c1edfc3b29 Merge "Fix bug where VABC xor is used on unsupported builds" 2022-01-27 22:30:57 +00:00
Treehugger Robot
e3935dd7f0 Merge "Skip generating care_map for non-AB updates" 2022-01-27 22:18:47 +00:00
Treehugger Robot
f77290b2b1 Merge "Fix RBC incremental builds" am: ff84a2b45d am: 2cc0ee7995 am: cf155caf5b am: 98b39119dd
Original change: https://android-review.googlesource.com/c/platform/build/+/1961825

Change-Id: I9864f0fe1af25c3858add9475ad1c03ce6c85747
2022-01-27 22:13:51 +00:00
Treehugger Robot
98b39119dd Merge "Fix RBC incremental builds" am: ff84a2b45d am: 2cc0ee7995 am: cf155caf5b
Original change: https://android-review.googlesource.com/c/platform/build/+/1961825

Change-Id: Ic68bc99291cd9e744d99bba668b1225972203689
2022-01-27 21:10:16 +00:00
Treehugger Robot
cf155caf5b Merge "Fix RBC incremental builds" am: ff84a2b45d am: 2cc0ee7995
Original change: https://android-review.googlesource.com/c/platform/build/+/1961825

Change-Id: I2c72df92b1fde24e475c3aef4e4a414968a3c405
2022-01-27 20:53:36 +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
Treehugger Robot
2cc0ee7995 Merge "Fix RBC incremental builds" am: ff84a2b45d
Original change: https://android-review.googlesource.com/c/platform/build/+/1961825

Change-Id: Ib71ea1f2d234be7285816796f66072e43a26463b
2022-01-27 20:34:59 +00:00
Treehugger Robot
ff84a2b45d Merge "Fix RBC incremental builds" 2022-01-27 20:02:35 +00: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
90721770ca Merge "Set JDK 11 for robolectric test configuration" am: ee5ceff61e am: 419277c2d2 am: 04913f819d am: ec03ba5c8d
Original change: https://android-review.googlesource.com/c/platform/build/+/1961320

Change-Id: Idcb928c490c5cf90e673dcaf3d60d6ab13527175
2022-01-26 23:02:59 +00:00
Cole Faust
10105b8157 Fix RBC incremental builds
Kati regenerates its ninja file if an environment variable
that was referenced by the makefiles was changed since the
last run. TRACE_BEGIN_SOONG is a constantly changing variable
that was referenced by dump-variables-rbc, which references
all all-caps variables, with a few exceptions.

Add TRACE_BEGIN_SOONG to that exception list so kati doesn't
rerun every time.

Fixes: 216531048
Test: Manually
Change-Id: I2df65b6f6aa968f132380e3410763d907d9e3e0f
2022-01-26 14:50:09 -08:00
Treehugger Robot
ec03ba5c8d Merge "Set JDK 11 for robolectric test configuration" am: ee5ceff61e am: 419277c2d2 am: 04913f819d
Original change: https://android-review.googlesource.com/c/platform/build/+/1961320

Change-Id: I3f531f65572e2f0cccc37fdf08e524e0926b4cde
2022-01-26 22:38:53 +00:00
Treehugger Robot
04913f819d Merge "Set JDK 11 for robolectric test configuration" am: ee5ceff61e am: 419277c2d2
Original change: https://android-review.googlesource.com/c/platform/build/+/1961320

Change-Id: Ie29285330040cc32eee46afdd012fe7a01d1dbaa
2022-01-26 22:21:11 +00:00
Treehugger Robot
419277c2d2 Merge "Set JDK 11 for robolectric test configuration" am: ee5ceff61e
Original change: https://android-review.googlesource.com/c/platform/build/+/1961320

Change-Id: I762047562d8420cda8966a6bc8daab43f1f06c62
2022-01-26 22:02:31 +00:00
Treehugger Robot
ee5ceff61e Merge "Set JDK 11 for robolectric test configuration" 2022-01-26 21:49:25 +00:00
Sorin Basca
bd0c8c1673 Set JDK 11 for robolectric test configuration
Fixes: 216277743
Test: atest --host NearbyRoboTests
Change-Id: Iedf76ea477d3f18d3ad790253e2328c87a7b5217
2022-01-26 14:05:02 +00:00
Joseph Jang
0aa995216c Merge "Revert "Update minimum supported targetSdk to 28."" am: d643a20d8a am: cf5f83a368 am: f3a78d5755 am: c55fca1407
Original change: https://android-review.googlesource.com/c/platform/build/+/1960148

Change-Id: I985bc4b98f7f7c2c97048923ec5a508708fef918
2022-01-26 05:15:29 +00:00
Joseph Jang
c55fca1407 Merge "Revert "Update minimum supported targetSdk to 28."" am: d643a20d8a am: cf5f83a368 am: f3a78d5755
Original change: https://android-review.googlesource.com/c/platform/build/+/1960148

Change-Id: I57cc556cc8da99d3c25397bd3e69b847356e7b0f
2022-01-26 05:02:08 +00:00
Joseph Jang
f3a78d5755 Merge "Revert "Update minimum supported targetSdk to 28."" am: d643a20d8a am: cf5f83a368
Original change: https://android-review.googlesource.com/c/platform/build/+/1960148

Change-Id: I4c3a7bc75dd3886a7e4f0dd91f44c3f35e5f10a6
2022-01-26 04:51:31 +00:00
Joseph Jang
cf5f83a368 Merge "Revert "Update minimum supported targetSdk to 28."" am: d643a20d8a
Original change: https://android-review.googlesource.com/c/platform/build/+/1960148

Change-Id: Ic6be7c736159ecae0f3cfa0e85cc2894a9369768
2022-01-26 04:34:05 +00:00