Commit Graph

74889 Commits

Author SHA1 Message Date
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
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
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
Joseph Jang
d643a20d8a Merge "Revert "Update minimum supported targetSdk to 28."" 2022-01-26 04:21:54 +00:00
Joseph Jang
cc1f5e43aa Revert "Update minimum supported targetSdk to 28."
This reverts commit 7918526355.

Reason for revert: <Test break by b/216280809>

Change-Id: I4d11564314034d7596261c1760dd79d3d5b82f2e
2022-01-26 03:15:15 +00:00
Treehugger Robot
0eba8f0757 Merge "releasetools: system_dlkm: add image to dist zip" am: ef8f4426ef am: e97ae10d73 am: 537cb49480
Original change: https://android-review.googlesource.com/c/platform/build/+/1958309

Change-Id: I9d648510706b867472c7c91320f2b446e3b07714
2022-01-25 21:07:24 +00:00
Treehugger Robot
537cb49480 Merge "releasetools: system_dlkm: add image to dist zip" am: ef8f4426ef am: e97ae10d73
Original change: https://android-review.googlesource.com/c/platform/build/+/1958309

Change-Id: I3d176118fc282205ff0a74a676404b843670e8ba
2022-01-25 20:40:33 +00:00
Treehugger Robot
e97ae10d73 Merge "releasetools: system_dlkm: add image to dist zip" am: ef8f4426ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1958309

Change-Id: I5e13518b347c96c0bfc5edad6bc5488978bd5191
2022-01-25 20:23:32 +00:00
Treehugger Robot
ef8f4426ef Merge "releasetools: system_dlkm: add image to dist zip" 2022-01-25 20:09:57 +00:00
Treehugger Robot
f3176ffd3d Merge "core/Makefile: system_dlkm: Copy image for dist" am: 488c598f24 am: e906d8edc0 am: 92fce4ef97
Original change: https://android-review.googlesource.com/c/platform/build/+/1958308

Change-Id: Ie853b9e38e13a7d231ac3ddc31f2cac7f8d6f5f7
2022-01-25 12:22:18 +00:00
Narayan Kamath
329167515e Merge "Update minimum supported targetSdk to 28." am: 3852e68d8b am: 7137d50d36 am: 9726098b55
Original change: https://android-review.googlesource.com/c/platform/build/+/1959079

Change-Id: I40018d35f3ca5485c75a5ac7eade7adddaf726dc
2022-01-25 12:21:54 +00:00
Treehugger Robot
92fce4ef97 Merge "core/Makefile: system_dlkm: Copy image for dist" am: 488c598f24 am: e906d8edc0
Original change: https://android-review.googlesource.com/c/platform/build/+/1958308

Change-Id: I2c97de8838b90c25f5093d85e408278fa0907c2f
2022-01-25 12:06:43 +00:00
Narayan Kamath
9726098b55 Merge "Update minimum supported targetSdk to 28." am: 3852e68d8b am: 7137d50d36
Original change: https://android-review.googlesource.com/c/platform/build/+/1959079

Change-Id: If96b429f55f0b095eb91104652fb549e1e353a91
2022-01-25 12:06:32 +00:00
Treehugger Robot
e906d8edc0 Merge "core/Makefile: system_dlkm: Copy image for dist" am: 488c598f24
Original change: https://android-review.googlesource.com/c/platform/build/+/1958308

Change-Id: I302cb1987066c6c4a9ad5df76f9bdb41cc156c24
2022-01-25 11:48:01 +00:00
Narayan Kamath
7137d50d36 Merge "Update minimum supported targetSdk to 28." am: 3852e68d8b
Original change: https://android-review.googlesource.com/c/platform/build/+/1959079

Change-Id: Ifcf9dad74c3444d4913dfa3412922a84ae92775f
2022-01-25 11:47:18 +00:00
Treehugger Robot
488c598f24 Merge "core/Makefile: system_dlkm: Copy image for dist" 2022-01-25 11:42:27 +00:00
Narayan Kamath
3852e68d8b Merge "Update minimum supported targetSdk to 28." 2022-01-25 10:33:37 +00:00
Treehugger Robot
0fa6028384 Merge "Fix licenses and license texts." am: 24b74875e9 am: d2d11848b9 am: 5ca9df0edb
Original change: https://android-review.googlesource.com/c/platform/build/+/1959641

Change-Id: I901451ed28641ff5ec933ec4fba7248ddf7101a5
2022-01-25 06:15:53 +00:00
Treehugger Robot
5ca9df0edb Merge "Fix licenses and license texts." am: 24b74875e9 am: d2d11848b9
Original change: https://android-review.googlesource.com/c/platform/build/+/1959641

Change-Id: I5d9190e4cb94c8c2730cb5139538eeda0b8d8a02
2022-01-25 05:57:46 +00:00
Treehugger Robot
d2d11848b9 Merge "Fix licenses and license texts." am: 24b74875e9
Original change: https://android-review.googlesource.com/c/platform/build/+/1959641

Change-Id: If87f7a0c312fc1a77c1c251e03b39b65522459df
2022-01-25 05:33:06 +00:00
Treehugger Robot
24b74875e9 Merge "Fix licenses and license texts." 2022-01-25 05:12:28 +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
Ramji Jiyani
034e777339 core/Makefile: system_dlkm: Copy image for dist
Add support to copy built system_dlkm to IMAGES;
or prebuilt image to PREBUILD_IMAGES for release
tools to pick up for the 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 "m" builds the system_dlkm.img in both cases;
        and drops image at out/target/product/vsoc_x86_64/
      - Check that "m dist" can find the image in
        $(zip_root)/IMAGES and $(zip_root)/PREBUILT_IMAGES
Test: launch_cvd && atest vts_system_dlkm_partition_test
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I77dfcc51746fd97cb205aa9c139a08f5cdf3d9ea
2022-01-24 21:27:52 +00:00
Devin Moore
327007b66c Merge "Fix initbootimage .PHONY target" am: 4724f77bca am: a4bb5a404f am: 046a98f644
Original change: https://android-review.googlesource.com/c/platform/build/+/1956276

Change-Id: I78bf70d8ee303520bee73d9b0824b7f3c03ce97a
2022-01-24 16:04:38 +00:00
Devin Moore
046a98f644 Merge "Fix initbootimage .PHONY target" am: 4724f77bca am: a4bb5a404f
Original change: https://android-review.googlesource.com/c/platform/build/+/1956276

Change-Id: Ia595d09e6a8386b10975e9995e8b27fead00aa95
2022-01-24 15:49:58 +00:00
Devin Moore
a4bb5a404f Merge "Fix initbootimage .PHONY target" am: 4724f77bca
Original change: https://android-review.googlesource.com/c/platform/build/+/1956276

Change-Id: Ia217a6f3f185b1ab1113c13b64803b4b6973bf49
2022-01-24 15:32:51 +00:00
Devin Moore
4724f77bca Merge "Fix initbootimage .PHONY target" 2022-01-24 15:17:17 +00:00
Narayan Kamath
7918526355 Update minimum supported targetSdk to 28.
Trailing by 4 major releases, as per schedule.

Test: make
Bug: 215522897
Change-Id: I893fe0ee68cce4b08061628ed641b845d2d79b63
2022-01-24 14:59:20 +00:00
Nicolas Geoffray
934fde3a64 Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" am: 7d0f8dd332 am: 08fbf0f75a am: 4f78caaa4e
Original change: https://android-review.googlesource.com/c/platform/build/+/1952765

Change-Id: Ic5028c0c348ecb06a561112434dd49fc63c0f8d4
2022-01-24 14:51:43 +00:00
Nicolas Geoffray
4f78caaa4e Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" am: 7d0f8dd332 am: 08fbf0f75a
Original change: https://android-review.googlesource.com/c/platform/build/+/1952765

Change-Id: I2e9363f35a74ab594e7bcc2308cb641ffe93d405
2022-01-24 14:35:04 +00:00
Nicolas Geoffray
08fbf0f75a Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" am: 7d0f8dd332
Original change: https://android-review.googlesource.com/c/platform/build/+/1952765

Change-Id: I2abcaf902b4817ee477ad57074dde7e587b6eb85
2022-01-24 14:17:56 +00:00
Nicolas Geoffray
7d0f8dd332 Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" 2022-01-24 13:59:48 +00:00
Treehugger Robot
b18796f9e5 Merge "core/Makefile: system_dlkm: Fix non avb dep typo" am: cf24fc2bf9 am: 5b6d4a2e13 am: 2de0ca59d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1957899

Change-Id: Idf71ec05fdd4dc2d91ba3f81fee24fc7b8633afa
2022-01-23 01:43:54 +00:00
Treehugger Robot
2de0ca59d6 Merge "core/Makefile: system_dlkm: Fix non avb dep typo" am: cf24fc2bf9 am: 5b6d4a2e13
Original change: https://android-review.googlesource.com/c/platform/build/+/1957899

Change-Id: Ibc792f2f6cdc688690d4ea5cca6a963695f038c8
2022-01-23 01:32:39 +00:00
Treehugger Robot
5b6d4a2e13 Merge "core/Makefile: system_dlkm: Fix non avb dep typo" am: cf24fc2bf9
Original change: https://android-review.googlesource.com/c/platform/build/+/1957899

Change-Id: Ie38dc9f09f7d6d77a4eb2452a07c4763d355b2ea
2022-01-23 01:15:17 +00:00
Treehugger Robot
cf24fc2bf9 Merge "core/Makefile: system_dlkm: Fix non avb dep typo" 2022-01-23 01:00:45 +00:00
Ramji Jiyani
107c452265 core/Makefile: system_dlkm: Fix non avb dep typo
$(MKFSEROFS) -> $(MKEROFS) in target dependency
for INSTALLED_SYSTEM_DLKM_IMAGE_TARGET in case
when AVB is not enabled.

Bug: 200082547
Test: TH
Test: atest vts_system_dlkm_partition_test
Fixes: 1065523a5e ("Add support to build system_dlkm.img")
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I03a4463b1fa01b95e706d623aa8a3888e37488d6
2022-01-22 20:38:49 +00:00
Ramji Jiyani
067c1cbbea Merge "Add support to build system_dlkm.img" am: 1a40ac361e am: f20e06e165 am: 42d87e1cd2
Original change: https://android-review.googlesource.com/c/platform/build/+/1955977

Change-Id: I224fd2e2c7d87a76cadab59bbec4fddd07eb0104
2022-01-22 10:54:56 +00:00