Commit Graph

29493 Commits

Author SHA1 Message Date
Ramji Jiyani
42d87e1cd2 Merge "Add support to build system_dlkm.img" am: 1a40ac361e am: f20e06e165
Original change: https://android-review.googlesource.com/c/platform/build/+/1955977

Change-Id: Ie91e7d75fd7a95914c6a83d7fbedd92e07cf4e4d
2022-01-22 10:44:06 +00:00
Ramji Jiyani
1a40ac361e Merge "Add support to build system_dlkm.img" 2022-01-22 10:07:18 +00:00
Treehugger Robot
60d01dfe83 Merge "Generalize @Keep annotation Proguard rules" am: 7ef84931aa am: d55d83e475 am: cb3f32d7e9
Original change: https://android-review.googlesource.com/c/platform/build/+/1923477

Change-Id: Ifa5d3f742a2b062bee03e44bf225ec6f104261d3
2022-01-22 00:24:58 +00:00
Treehugger Robot
cb3f32d7e9 Merge "Generalize @Keep annotation Proguard rules" am: 7ef84931aa am: d55d83e475
Original change: https://android-review.googlesource.com/c/platform/build/+/1923477

Change-Id: I4d6782eba6124880aaad5b20d17aea2c55614460
2022-01-22 00:07:29 +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
dbdd594fae Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0 am: 6332808700 am: 76c6975e05
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525

Change-Id: Ic2454804d74ef2a3862a6b3ced172aefdbd9eccc
2022-01-19 06:51:32 +00:00
Pirama Arumuga Nainar
76c6975e05 Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0 am: 6332808700
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525

Change-Id: I8d711cdaf94e5a88da0e863fde3bab56ab3aeb60
2022-01-19 06:33:30 +00:00
Pirama Arumuga Nainar
5fe798bea0 Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" 2022-01-19 06:03:25 +00:00
Bassem Khalife
cfd95b84f7 Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e am: 87a92018fc am: 6833559fbd am: ac9415f174
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16644783

Change-Id: I8ca46503a4d23d2aa915cce7b19260decbec656d
2022-01-18 21:17:07 +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
22d159fd3c Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." am: 00a48b3df7 am: 3cb208e273 am: d43a0701d9
Original change: https://android-review.googlesource.com/c/platform/build/+/1948581

Change-Id: I107975440f1d9d9ae1ec8b57593cb7b7d2fdbeeb
2022-01-17 13:16:45 +00:00
Nicolas Geoffray
d43a0701d9 Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." am: 00a48b3df7 am: 3cb208e273
Original change: https://android-review.googlesource.com/c/platform/build/+/1948581

Change-Id: I1a545ff9b11e181c6ba7c0ccb9518aad547cf5f2
2022-01-17 13:00:53 +00: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
78f5c8b0e1 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" am: 4fe2a45dc7 am: 2f2c110829 am: c06825ad77
Original change: https://android-review.googlesource.com/c/platform/build/+/1944700

Change-Id: Ie689812cee0f3476aa2c3df988c70c5d5e241fb9
2022-01-17 06:11:19 +00:00
Yi-yo Chiang
c06825ad77 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" am: 4fe2a45dc7 am: 2f2c110829
Original change: https://android-review.googlesource.com/c/platform/build/+/1944700

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

Change-Id: Ibe6b331b3ae6637a0705e16c3afdcd9ff92e6f92
2022-01-17 05:38:40 +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
f2c62d7ddb Merge changes from topic "gki-avb-vts" am: 8b4e2fd6c0 am: b45caeb134
Original change: https://android-review.googlesource.com/c/platform/build/+/1941496

Change-Id: I6a5cf765a64daceb3030e58c250108bb2e88395f
2022-01-17 05:21:53 +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
ac9415f174 Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e am: 87a92018fc am: 6833559fbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Bug: 214731054
Bug: 211820647

Change-Id: Ifd4306f79809fb8c744d2c601bb2dec4038c5782
Merged-In: Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863
2022-01-16 04:10:36 +00:00
Bassem Khalife
6833559fbd Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e am: 87a92018fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: I652af09a72cae6f5d9ea9d74b505e36e115c7a5b
2022-01-15 21:37:55 +00:00
Bassem Khalife
87a92018fc Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: I6587646279387e16f46698d11b28b36ad887e286
2022-01-15 21:26:06 +00:00
Bassem Khalife
0c1d6c0f4e Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: Ifbb2444e7140a95f841f3d31c59aed0b278ec9e0
2022-01-15 21:08:58 +00:00
Bassem Khalife
da539453f8 Update security string to 2022-03-01 am: 389f21950c am: eb389ab195
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: I3d02490cbef81683eab9b2aa02f3c5a7fcf9822e
2022-01-15 20:49:30 +00:00
Bassem Khalife
eb389ab195 Update security string to 2022-03-01 am: 389f21950c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16579523

Change-Id: Iaba1fff7f3f45062087c7c276a48467324389b52
2022-01-15 20:33: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
Yi-Yo Chiang
f282f5521d Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST
Right now if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST is given,
  $ m dist bootimage
would copy boot*.img to the dist dir.

After this change, both
  $ m dist  # droidcore
  $ m dist bootimage
would copy boot*.img to the dist dir, the difference is that the latter
builds & copies *only* the boot images.

Bug: 212486689
Test: m dist bootimage
Test: m dist => boot*.img are copied to dist dir
Change-Id: I1c714ce5d75eba93e32078b1ac291a181b05405a
2022-01-11 17:31:16 +08:00
Yi-yo Chiang
3d4a988016 Merge "Fix init_boot partition AVB signing" am: 27a309f627 am: 85128a7fa0 am: d31e97cc6d
Original change: https://android-review.googlesource.com/c/platform/build/+/1941494

Change-Id: I411a13d03f03f0271e434adaebf1157617cbf581
2022-01-11 07:49:54 +00:00