Commit Graph

29493 Commits

Author SHA1 Message Date
Cole Faust
1bcdd24ad9 Pass --makefile_list to rbc board configuration
So that mk2rbc will just read from the file instead
of searching the source tree for makefiles.

Bug: 213508006
Test: m RBC_BOARD_CONFIG=1 nothing
Change-Id: I6b7e2aa000ad9861173c58cc06f6d49c9c11a0a7
2022-02-07 15:17:55 -08:00
Jared Duke
df60c0bb14 Update default system Proguard config rules
Use the `includedescriptorclasses` modifier with the native keep rules
to ensure native method signatures remain preserved. This matches
common native Proguard rules used elsewhere.

Bug: 196084106
Test: m + presubmit
Change-Id: Ie413459ad0f65ce6b8cd6eb34318494c12568c5e
2022-02-07 10:54:51 -08:00
Pirama Arumuga Nainar
d6b0a87ed7 Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code
Bug: http://b/215753485

This allows enabling a new warning from the compiler update for
first-party code.  This is less precise than the check in build/soong
(also overrides for vendor/google, for e.g.) because of being written in
Make.

Test: With new clang, verify the following:
    lunch oriole;
    m out/target/product/oriole/obj_arm/SHARED_LIBRARIES/libexynosdisplay_intermediates/libresource/ExynosMPP.o
Change-Id: I13080fec71e282c4b528a6d01b967b1c0c4aef02
2022-02-05 13:50:41 -08:00
Treehugger Robot
144934f1fc Merge "core & tools: system_dlkm: add dynamic partition" am: ef25de413e am: 0f5c34115c am: b4a4dee4c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1963868

Change-Id: Iafeb57ac3c34e9a0acc9d3aa4fa8a8d117be1b25
2022-02-02 07:03:07 +00: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
ef25de413e Merge "core & tools: system_dlkm: add dynamic partition" 2022-02-02 06:04:07 +00:00
Baligh Uddin
f9723ff858 Merge "Move pvmfw.img to PREBUILT_IMAGES temporarily" am: 1a95fc381c am: 4bfbb5f713 am: 014b99ee06
Original change: https://android-review.googlesource.com/c/platform/build/+/1966606

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

Change-Id: Ie12ad9965486ef38856733a0bcf40f6eb723312c
2022-02-01 20:39:32 +00: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
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
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
Treehugger Robot
0d043d394c Merge "Output inherit trace as Make comments." am: afe22b9a74 am: 8d29aeb27e am: ded3f2403b
Original change: https://android-review.googlesource.com/c/platform/build/+/1953756

Change-Id: Ia9ec1cb7e54a605753a9d898fdcd519740eeb80b
2022-01-29 06:17:22 +00:00
Treehugger Robot
ded3f2403b Merge "Output inherit trace as Make comments." am: afe22b9a74 am: 8d29aeb27e
Original change: https://android-review.googlesource.com/c/platform/build/+/1953756

Change-Id: I260b8663ab222c5cf99c3ae9d4773e093e97866a
2022-01-29 06:01:11 +00:00
Sasha Smundak
dd3598da56 Output inherit trace as Make comments.
Starlark configuration output is a makefile containing variable
assignments. Inheritance trace is also written to stdout. Trace lines
need to be comments, otherwise stdout cannot be digested by Make/Ckati.

Test: manual
Change-Id: I3c1ad6554ef4356f9ceff1ff3279b2eac962e9ac
2022-01-28 17:44:56 -08: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
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
766c5343e2 Merge "Add a version code and version name to fsverity manifest APK" 2022-01-27 23:48:24 +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
ff84a2b45d Merge "Fix RBC incremental builds" 2022-01-27 20:02:35 +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
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
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
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
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
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
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
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
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