Commit Graph

29461 Commits

Author SHA1 Message Date
Treehugger Robot
ef25de413e Merge "core & tools: system_dlkm: add dynamic partition" 2022-02-02 06:04:07 +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
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
766c5343e2 Merge "Add a version code and version name to fsverity manifest APK" 2022-01-27 23:48:24 +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
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
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
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
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
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
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
1a40ac361e Merge "Add support to build system_dlkm.img" 2022-01-22 10:07:18 +00:00
Ramji Jiyani
1065523a5e Add support to build system_dlkm.img
There are 2 choices to build system_dlkm.img for
the system_dlkm partition for Android T launch
devices and must choose one.

1. Use kernel prebuilt system_dlkm.img
   - BOARD_PREBUILT_SYSTEM_DLKM_IMAGE to point image
2. Build from kernel prebuilt system_dlkm_staging
   - PRODUCT_BUILD_SYSTEM_DLKM_IMAGE

Both requires: BOARD_SYSTEM_DLKM_PARTITION_SIZE and
must be 64MB or higher in size (enforced via vts).

Bug: 200082547
Test: TH
Test: atest vts_system_dlkm_partition_test
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I83435123bd8aa3d04ab8a8b650a95fbab0bc49f2
2022-01-21 21:39:15 +00:00
Jared Duke
4bd749bf38 Generalize @Keep annotation Proguard rules
Consolidate the Proguard rules for @Keep annotations for:
  * android.support.annotation.Keep (existing)
  * androidx.annotation.Keep (existing)
  * com.android.internal.annotation.Keep (new)

This ensures consistent semantics for clients using these annotations
across the codebase. Ideally there would be a single annotation, but
the support libraries are not available everywhere. In practice, this
change should be a no-op.

Bug: 210510433
Test: m + validate identical artifact sizes
Change-Id: Iab494e03269e5758d7f860331e971826ecc08cdd
2022-01-21 19:50:15 +00:00
Devin Moore
35b69f698d Fix initbootimage .PHONY target
This was assigning the INSTALLED_INIT_BOOT_IMAGE_TARGET to bootimage
instead of initbootimage.

Test: m
Bug: 203698939
Change-Id: I5fc6e2296dac8cc35c4d46601fea6ab0ee18fd18
2022-01-20 15:26:47 +00:00
Nicolas Geoffray
4ff406c4a1 Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."
This reverts commit 50930076a2.

Bug: 214049018

Reason for revert: Not needed after all.

Change-Id: Ifbf3053fd70c5880e58136821a2fb8b783c48e2a
2022-01-19 16:22:07 +00:00
Pirama Arumuga Nainar
5fe798bea0 Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" 2022-01-19 06:03:25 +00:00
Pirama Arumuga Nainar
e6b8497408 Revert "Set a BIONIC_COVERAGE .mk variable"
This reverts commit b1b4e1e38b.

Bug: http://b/194128476

Coverage metrics dropped for ~10 of the 40 modules.  There are also
regressions in mainline when running tests on older platform builds.

Test: presubmit
Change-Id: Ib34f607292cd64e7cb9fe35c59a4f79b46904ab8
2022-01-18 13:09:01 -08:00
Nicolas Geoffray
00a48b3df7 Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." 2022-01-17 12:23:19 +00:00
Yi-yo Chiang
4fe2a45dc7 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" 2022-01-17 05:29:40 +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
Bassem Khalife
aaf39a53f9 Update Security String to 2022-03-05 am: 16caffd2e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579303

Change-Id: If37e38c997ad736b84326bff4d83bc0bc5d4066e
2022-01-15 16:37:59 +00:00
Muhammad Haseeb Ahmad
b84ac93aed Merge "Add PHONY target to make haiku-java target" am: d562eb5f1c am: 2e44587697 am: aaa71e0ee6
Original change: https://android-review.googlesource.com/c/platform/build/+/1948125

Change-Id: Ie76e0acb599d64d528c14ad0af28c084bbaabfab
2022-01-14 19:19:33 +00:00
Muhammad Haseeb Ahmad
aaa71e0ee6 Merge "Add PHONY target to make haiku-java target" am: d562eb5f1c am: 2e44587697
Original change: https://android-review.googlesource.com/c/platform/build/+/1948125

Change-Id: Ia3d813687a650b431a4ca319959dde1aa646c297
2022-01-14 18:59:55 +00:00
Muhammad Haseeb Ahmad
d562eb5f1c Merge "Add PHONY target to make haiku-java target" 2022-01-14 18:13:12 +00:00
Nicolas Geoffray
50930076a2 Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing.
Keep the property for now to keep the ability to toggle on/off the
library we want. If we want to remove this functionality,
we need to cleanup all references to persist.sys.dalvik.vm.lib.2.

Test: build and boot with debug apex
Bug: 214049018
Change-Id: I66c7eb510f5a8b7974391ceafd309fba59a524a1
2022-01-14 16:07:07 +00:00
Treehugger Robot
cf0e8f576b Merge "Dump soong config variables in dump-variables-rbc" am: 9e81c44875 am: 636eac9642 am: ac95c8630a
Original change: https://android-review.googlesource.com/c/platform/build/+/1948233

Change-Id: Ic16b24c49faf76fd4a9e35dc82bc4d9046c63a30
2022-01-13 21:04:31 +00:00
Treehugger Robot
ac95c8630a Merge "Dump soong config variables in dump-variables-rbc" am: 9e81c44875 am: 636eac9642
Original change: https://android-review.googlesource.com/c/platform/build/+/1948233

Change-Id: I45951e6492a09b4a9eb74d03535f36b1f65eefdc
2022-01-13 20:49:44 +00:00
Treehugger Robot
9e81c44875 Merge "Dump soong config variables in dump-variables-rbc" 2022-01-13 20:21:33 +00:00
Muhammad Haseeb Ahmad
cced136e8c Add PHONY target to make haiku-java target
This build creates artifacts for java fuzzers for Haiku.

Bug: 213225119
Test: build/soong/soong_ui.bash --make-mode -j86 haiku-java showcommands
dist DIST_DIR="."

Change-Id: I1ec16c39c3cd0ca008acc38bc51a3c3fa2ecdc9f
2022-01-13 19:53:40 +00:00
Cole Faust
c7226590e6 Dump soong config variables in dump-variables-rbc
There are some products whose board configurations
use soong_config_get to read the values of soong config
variables that were set in the product configuration.
These variables were being lost, as dump-variables-rbc
was skipping the soong config variables because mk2rbc
couldn't handle converting the raw SOONG_CONFIG_* variables.
To fix that issue, dump-variables-rbc now dumps them as
calls to soong_config_set instead.

Bug: 201700692
Test: m RBC_BOARD_CONFIG=1 nothing on certain products
Change-Id: I91ca8418635a94cf80362cad1729f48854f6bc98
2022-01-12 21:25:02 -08:00
Treehugger Robot
5eb6ea9bf1 Merge "Generate .fsv_meta for more files" am: d36d4d8608 am: 0f84df6a5e am: bb37d74201
Original change: https://android-review.googlesource.com/c/platform/build/+/1941099

Change-Id: I60f1f186c3230029a16245e747e924bbec9a62a4
2022-01-13 01:56:50 +00:00
Treehugger Robot
bb37d74201 Merge "Generate .fsv_meta for more files" am: d36d4d8608 am: 0f84df6a5e
Original change: https://android-review.googlesource.com/c/platform/build/+/1941099

Change-Id: I233936f781d48f775eca1208ce50f27aeacb2ac6
2022-01-13 01:39:17 +00:00
Treehugger Robot
d36d4d8608 Merge "Generate .fsv_meta for more files" 2022-01-13 01:06:01 +00:00
Treehugger Robot
a45477cc11 Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" am: 49c9d1867a am: 4a1fbf832d am: 3c2b365e23
Original change: https://android-review.googlesource.com/c/platform/build/+/1941098

Change-Id: Ibefbe52bd7c4d85ab89521f37acd8f0874061313
2022-01-12 21:56:01 +00:00
Treehugger Robot
3c2b365e23 Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" am: 49c9d1867a am: 4a1fbf832d
Original change: https://android-review.googlesource.com/c/platform/build/+/1941098

Change-Id: Id484f0cced953a4a94dc45f07963562e90025d8a
2022-01-12 21:35:59 +00:00
Treehugger Robot
49c9d1867a Merge "Add TARGET_RECOVERY_FSTAB_GENRULE" 2022-01-12 20:55:38 +00:00
Treehugger Robot
ecb58be871 Merge "Remove win_sdk" am: d6bdfb3993 am: 9bc76efb0c am: ff5f9c27aa
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: I1440b9ec6e658f50803113f082ddd651b22f80d1
2022-01-11 23:22:57 +00:00
Treehugger Robot
ff5f9c27aa Merge "Remove win_sdk" am: d6bdfb3993 am: 9bc76efb0c
Original change: https://android-review.googlesource.com/c/platform/build/+/1944430

Change-Id: Id7a09731d90cae8869ea29327887cd650a086b07
2022-01-11 23:07:48 +00:00
Treehugger Robot
d6bdfb3993 Merge "Remove win_sdk" 2022-01-11 22:25:02 +00:00
Cole Faust
fdc2cd300e Remove win_sdk
win_sdk is deprecated, if given on the command line
sdk will be build instead.

Bug: 212724080
Test: Presubmits
Change-Id: Ib3bd51923142b00100b49585ad88bc1292da2463
2022-01-11 10:31:11 -08:00