Commit Graph

8595 Commits

Author SHA1 Message Date
Sam Delmerico
8b9539324a add module_arm64only product
64bit only systems won't load modules with mixed 32/64 binaries. We need
a 64bit only product to build with.

Bug: 205990590
Test: lunch module_arm64only && m
Change-Id: I050a673bfa95978e624e64004089fe7a2b8e0a95
Merged-In: I050a673bfa95978e624e64004089fe7a2b8e0a95
2022-09-06 14:34:27 +00:00
Anna Zhuravleva
30dd9b143d Add healthconnect library to bootlcasspath.
Test: build, checked bootclasspath
Bug: 244547761
Change-Id: I85fd85826e951494b96c4948e657d817e32429b4
2022-09-06 11:20:32 +00:00
Sam Delmerico
5db1483923 Merge changes from topic "cherrypick-mm-x86-64only-mxeb4hscz3"
* changes:
  [automerge] add module_x86_64only product 2p: f7ee62d73d
  add module_x86_64only product
2022-09-02 18:45:56 +00:00
Sandro Montanari
e5fa40f886 Merge "Make com.android.sepolicy mandatory" am: dd0a85b0eb am: 5586b4c5aa am: 6d8216accf am: db5b61b99c
Original change: https://android-review.googlesource.com/c/platform/build/+/2199179

Change-Id: I71466b42f03d585409027a0661dc12d7e5f2f3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 11:52:23 +00:00
Sam Delmerico
05c7f96b9b [automerge] add module_x86_64only product 2p: f7ee62d73d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19819493

Bug: 205990590
Change-Id: I5db85d93ef9790551884deffa4492b71f66e3629
2022-09-01 22:55:33 +00:00
Sam Delmerico
f7ee62d73d add module_x86_64only product
64bit only systems won't load modules with mixed 32/64 binaries. We need
a 64bit only product to build with.

Bug: 205990590
Test: lunch module_x86_64only && m
Test: vendor/google/build/build_mainline_modules.sh
Change-Id: I906f6cd10882986c8182ed16916e07c0f0d8b32e
2022-09-01 22:55:25 +00:00
Sam Delmerico
790ab7795e [automerge] add module_arm64only product 2p: 01d7c4745a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19818771

Bug: 205990590
Change-Id: Ic95213f53d654d6cc2aedcc8e4481073f0bcd5cc
2022-09-01 22:52:06 +00:00
Sam Delmerico
01d7c4745a add module_arm64only product
64bit only systems won't load modules with mixed 32/64 binaries. We need
a 64bit only product to build with.

Bug: 205990590
Test: lunch module_arm64only && m
Change-Id: I050a673bfa95978e624e64004089fe7a2b8e0a95
2022-09-01 22:52:00 +00:00
Sandro
fd1a018a48 Make com.android.sepolicy mandatory
The apex_sepolicy files were removed from the system partition in
ag/17753690 because they were not necessary in T builds.

For updatable sepolicy in Android U+ we are planning to move parts of
the existing platform policy into the apex sepolicy, so we will need to
make the apex_sepolicy files available to all builds.

Bug: 243923977
Test: adb shell ls /dev/selinux /system/etc/selinux
Change-Id: I24b8b8880149885d98caf992afdae908ead11fcf
2022-09-01 09:11:37 +00:00
Treehugger Robot
7f8cbf5930 Merge "Allow to force ro.audio.silent=1 in build." am: 00b4775107 am: 8bc1c2a558 am: befa9f51d3 am: f5ddca6cfd am: 529ff5a617
Original change: https://android-review.googlesource.com/c/platform/build/+/2197757

Change-Id: I6776bdb82669ca393522793fc698e3be0c69a6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 02:17:47 +00:00
Treehugger Robot
529ff5a617 Merge "Allow to force ro.audio.silent=1 in build." am: 00b4775107 am: 8bc1c2a558 am: befa9f51d3 am: f5ddca6cfd
Original change: https://android-review.googlesource.com/c/platform/build/+/2197757

Change-Id: I809d4c18fc5d0c21e46c91f338b3b8cb13c2901c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 01:49:46 +00:00
Treehugger Robot
00b4775107 Merge "Allow to force ro.audio.silent=1 in build." 2022-08-29 23:38:07 +00:00
Florian Mayer
fd1187e821 Allow to force ro.audio.silent=1 in build.
Change-Id: I3e0775dc0befb09d47525284351dad099090b96b
2022-08-26 21:52:57 +00:00
Treehugger Robot
1e973ad976 Merge "Add mtectrl to the base image." am: a52c09d238 am: 8c87cf8f77 am: cb62ae369b am: 9165181554 am: c41a9540cb
Original change: https://android-review.googlesource.com/c/platform/build/+/2197576

Change-Id: If6b3794cf272bc3666ba4515121d35c738dd0e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 12:39:53 +00:00
Treehugger Robot
c41a9540cb Merge "Add mtectrl to the base image." am: a52c09d238 am: 8c87cf8f77 am: cb62ae369b am: 9165181554
Original change: https://android-review.googlesource.com/c/platform/build/+/2197576

Change-Id: I02b4e6283add1605a2d52179235c5661ffa43751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 12:12:19 +00:00
Evgenii Stepanov
49fd191501 Add mtectrl to the base image.
This is a tiny utility (11Kb) that implements the bootloader switch
interface for MTE:
https://source.android.com/docs/security/memory-safety/bootloader-support

It is only useful on armv8.5+ devices, but there is no separate GSI
image for those.

Bug: 242244112
Test: ls /system/bin/mtectrl
Change-Id: I2696a76d5828007a2db486f41064bcfc0e89ec36
2022-08-25 16:20:34 -07:00
Yifan Hong
2e1a7e111d Merge "Set default recovery USB vendor/product IDs." am: 9d4741cefb am: e72817456b am: e766ed31df am: 7322ef72f5 am: d162092f4e
Original change: https://android-review.googlesource.com/c/platform/build/+/2186500

Change-Id: I5c749aca8e46d24a08f3d064547301d01a09106a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 20:33:24 +00:00
Yifan Hong
d162092f4e Merge "Set default recovery USB vendor/product IDs." am: 9d4741cefb am: e72817456b am: e766ed31df am: 7322ef72f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2186500

Change-Id: I8e87972003beb249c92898307eabae0d130849b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 20:02:56 +00:00
Yifan Hong
9d4741cefb Merge "Set default recovery USB vendor/product IDs." 2022-08-25 18:08:14 +00:00
Treehugger Robot
d24254bcd9 Merge "GSI: add VNDK 33/remove VNDK 28" am: 464ed2fda1 am: a45dd66042 am: 3416611526 am: ec98964749 am: f7c4206eb4
Original change: https://android-review.googlesource.com/c/platform/build/+/2194963

Change-Id: Ic8fa3c648a83403fbc8362388a1dd50628c4b5e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 06:11:24 +00:00
Treehugger Robot
f7c4206eb4 Merge "GSI: add VNDK 33/remove VNDK 28" am: 464ed2fda1 am: a45dd66042 am: 3416611526 am: ec98964749
Original change: https://android-review.googlesource.com/c/platform/build/+/2194963

Change-Id: I6edc9f31ab5cb0b272f75affd011f8c414bf3b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 05:40:55 +00:00
Hung-ying Tyan
bdce249c63 GSI: add VNDK 33/remove VNDK 28
Bug: 243530456
Test: mix GSI on Android 13 Cuttlefish
Change-Id: I7af784ac6fda2015fa7e9da8cf552755fd74d2e7
2022-08-25 08:11:42 +08:00
TreeHugger Robot
5958c3abe8 Merge "Add HealthConnect module to base_system.mk" 2022-08-24 20:44:23 +00:00
Josh Gao
8d0b576af6 Set default recovery USB vendor/product IDs.
Add system properties to let vendors customize the recovery/fastbootd
USB IDs.

Test: `adb reboot fastboot && fastboot wait-for-device && lsusb -d 18d1:`
Change-Id: I70881f27d579dd54371f59a6a76f9b1f80ce9b47
2022-08-17 15:00:48 -07:00
Hung-Wei Chen
d194b86fd1 Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1 am: cb7c04f783 am: f44646461d am: 653425238b am: 1a2b5f7b91
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952

Change-Id: I9be6e54fdcfb684dc11585f4aecc1aff67feeedd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 16:50:16 +00:00
Hung-Wei Chen
1a2b5f7b91 Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1 am: cb7c04f783 am: f44646461d am: 653425238b
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952

Change-Id: I4d64aeb78e79a10308759fc9a18d883806f7b31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 05:08:18 +00:00
Hung-Wei Chen
a7dfb456a1 Merge changes Ifbcde7da,Icee659ff,I267da2d5
* changes:
  Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
  Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
  Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
2022-08-17 03:09:20 +00:00
Anna Zhuravleva
54cd052e04 Add HealthConnect module to base_system.mk
Bug: 242298335
Test: build
Change-Id: I30dce77d48895621c9a557c1bb154066f5d31aba
2022-08-15 16:00:30 +00:00
Rajeev Kumar
a0db5befcb Merge "Add per-file OWNERS for Android Go specific files." into tm-qpr-dev am: c89772f104 am: dce3e85344
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19602266

Change-Id: I8cbc8f17598a8656ffea7fe6752a22ce054b952b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 03:55:40 +00:00
Rajeev Kumar
dce3e85344 Merge "Add per-file OWNERS for Android Go specific files." into tm-qpr-dev am: c89772f104
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19589591

Change-Id: Ifd01faee5f9ec3333a1e608d591451aa97a45e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 00:17:22 +00:00
Rajeev Kumar
c89772f104 Merge "Add per-file OWNERS for Android Go specific files." into tm-qpr-dev 2022-08-11 23:58:47 +00:00
Rajeev Kumar
cf9f788762 Merge "Add per-file OWNERS for Android Go specific files." am: 7cf297a7ed am: 6e706d5ef8 am: 2c1312053b am: b695fc1fe9 am: 89edb50c19
Original change: https://android-review.googlesource.com/c/platform/build/+/2182777

Change-Id: Ib3325dde0042b50495e46b5f83ad6f6f456d06f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:55:56 +00:00
Rajeev Kumar
89edb50c19 Merge "Add per-file OWNERS for Android Go specific files." am: 7cf297a7ed am: 6e706d5ef8 am: 2c1312053b am: b695fc1fe9
Original change: https://android-review.googlesource.com/c/platform/build/+/2182777

Change-Id: I190d57b5437e3e05b4a1ec9a6770d54d6f3d0872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:38:03 +00:00
Rajeev Kumar
6e706d5ef8 Merge "Add per-file OWNERS for Android Go specific files." am: 7cf297a7ed
Original change: https://android-review.googlesource.com/c/platform/build/+/2182777

Change-Id: I21ea85a4d53ae19ca5cbff4f2ef524ba9a5db9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 18:21:03 +00:00
Rajeev Kumar
646c0e2a46 Add per-file OWNERS for Android Go specific files.
Bug: N/A
Test: N/A
Change-Id: Idff60019629226119c42906cc832344d6004b688
Merged-In: f852dd7fba
2022-08-11 18:04:04 +00:00
TreeHugger Robot
a2466a8966 Merge "Get rid of inprocess network stack product packages from Go defaults." into tm-qpr-dev am: c3faf53de3 am: 65a0cae5ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19563878

Change-Id: I60ecb5b9aae5e77c5a1f3ce388c3c19d85a57d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 17:40:59 +00:00
TreeHugger Robot
65a0cae5ab Merge "Get rid of inprocess network stack product packages from Go defaults." into tm-qpr-dev am: c3faf53de3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19563878

Change-Id: Iff1f0ecbb20205ca6888b30498eae7b26ab17289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 17:23:45 +00:00
hungweichen
e3ca398a1e Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
verity.mk is used to set the related variable for VB 1.0 support, but
we already removed VB 1.0. This change removes the unused code. We also
remove and block PRODUCT_VERITY_SIGNING_KEY in this change.

Bug: 241044073
Test: atest under build/make
Change-Id: Ifbcde7da27a931ef3b9d746b1c5a279d88c0ec85
2022-08-11 08:12:58 +00:00
hungweichen
bf11e34897 Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
PRODUCT_SUPPORTS_VERITY and PRODUCT_SUPPORTS_VERITY_FEC are going to be
deprecated since we removed VB 1.0 support. This change removes the
related references.

Bug: 241044073
Test: atest under build/make
Change-Id: Icee659ff0606cda1ab44e92372d86a394ddf1466
2022-08-11 08:12:58 +00:00
hungweichen
b2dd683421 Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
These varaibles are going to be deprecated since we removed VB 1.0
support. This change removes the related references. boot.img can be
verified by a AVB 2.0 hash descriptor now.

Bug: 241044073
Test: atest under build/make
Change-Id: I267da2d591525ffc0cabf92791cf66a36ef8ff62
2022-08-11 08:12:58 +00:00
Rajeev Kumar
f852dd7fba Add per-file OWNERS for Android Go specific files.
Bug: N/A
Test: N/A
Change-Id: Idff60019629226119c42906cc832344d6004b688
2022-08-10 20:15:04 -07:00
Yi-yo Chiang
62f51bef9d Merge "Move 'remount' back into 'adbd_system_api'" am: db8b58b2bc am: 5ea7a5fe86 am: 647d8918b6 am: 24d47be917 am: 235a06f493
Original change: https://android-review.googlesource.com/c/platform/build/+/2175132

Change-Id: I86e43f1f73b6113a259fb1d85ab9b16c1de706eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 15:21:05 +00:00
Yi-yo Chiang
235a06f493 Merge "Move 'remount' back into 'adbd_system_api'" am: db8b58b2bc am: 5ea7a5fe86 am: 647d8918b6 am: 24d47be917
Original change: https://android-review.googlesource.com/c/platform/build/+/2175132

Change-Id: Ic5677bd0bbcb4d4d2dd80be753180e8802f15450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 14:40:25 +00:00
Yi-yo Chiang
5ea7a5fe86 Merge "Move 'remount' back into 'adbd_system_api'" am: db8b58b2bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2175132

Change-Id: Ib6d66459b16b75285a6be1f08106419616e1a654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 13:05:00 +00:00
Yi-yo Chiang
db8b58b2bc Merge "Move 'remount' back into 'adbd_system_api'" 2022-08-09 12:47:36 +00:00
Rajeev Kumar
591d2e93fb Get rid of inprocess network stack product packages from Go defaults.
Moved this to gms_base.mk

Bug: 241180471
Fixes: 241180471
Test: atest android.net.EthernetTetheringTest
Change-Id: I4e1b4b99a008a36230a125953a20248208c5c623
2022-08-09 09:07:59 +00:00
Yi-Yo Chiang
0cb64f00f7 Move 'remount' back into 'adbd_system_api'
It was inlined in base_system.mk during the adbd apex bring up phase,
because adbd apex was thought to have broken "required:" dependency.
Now that we have 'adb_system_api' to track the dependencies of adbd, we
can move 'remount' into the phony module.

Bug: 241688845
Test: m adbd_system_api w/ user & userdebug build
Change-Id: I5d7c66c517d5e7022601cc4705a447d5a4ba1be4
2022-08-07 15:52:13 +00:00
Matt Casey
8ef7fd9c7b Merge "Revert "Remove IntentResolver from build"" into tm-qpr-dev am: 3431ff8bf3 am: 7b08854389
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19488779

Change-Id: If63fef8495c24f06ebe83f1c4b76377d1501e94c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 17:32:54 +00:00
Matt Casey
7b08854389 Merge "Revert "Remove IntentResolver from build"" into tm-qpr-dev am: 3431ff8bf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19488779

Change-Id: Ie462de7e665581d6f59a1d067cec0b08fa523dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 16:56:51 +00:00
Matt Casey
3431ff8bf3 Merge "Revert "Remove IntentResolver from build"" into tm-qpr-dev 2022-08-04 16:35:23 +00:00