Commit graph

78863 commits

Author SHA1 Message Date
Christopher Ferris
5a564d837c Add support for only starting 64 bit zygote.
Added code to support a single system image that can start the
64 bit zygote only, or both the 64 bit and 32 bit zygote. By
default, the system will default to 64 bit only.

For this image, all abilist properties are only present in the
vendor partition. All other copies of these properties are deleted.

Bug: 227482437

Test: Verified that secondary doesn't start with same disk image
Test: with ro.zygote set to zygote64 and abilists set appropriately.
Test: Verified that secondary does not start when restarting netd.
Test: with ro.zygote set to zygote64_32 and abilists set appropriately.
Test: Verified that secondary does start when restarting netd.
Test: Verified that a 64 bit device only starts the primary.
Test: Verified that a 32 bit device only starts the primary.
Change-Id: Ifc6413cecc4df8ba041699f7d0b10786d1926d64
Merged-In: Ifc6413cecc4df8ba041699f7d0b10786d1926d64
2022-07-13 20:01:23 +00:00
Paul Duffin
f261c142ad Do not override setting of SOONG_CONFIG_<m>_module_source_build am: dccd189954
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19033310

Change-Id: I76f64bd6669649981579c8fcb6ea2f8f3827b9c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 18:06:36 +00:00
Paul Duffin
dccd189954 Do not override setting of SOONG_CONFIG_<m>_module_source_build
Previously, any setting of SOONG_CONFIG_<m>_module_source_build (where
<m> is one of wifi, uwb or bluetooth) that was made before the
core/android_soong_config_vars.mk was processed would be replaced with
false. This change will only set them to false if they have not been
previously set.

Bug: 233965247
Test: m nothing
      # After setting SOONG_CONFIG_wifi_module_source=true before this
      # code. Without this change out/soong/soong.variables uses false
      # for the wifi_module/module_source config variable. With this
      # change it uses true.
Change-Id: I1dffeb055a68250f574630d4ef5fedc51bad4a2b
2022-06-23 13:19:00 +00:00
William Escande
1f82bb50c6 Change Bluetooth apex mountpoint am: 9c2f61119c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19038222

Change-Id: Ifa0cbb6c6a9b184409d766ae55f670994c015c8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 10:35:10 +00:00
William Escande
9c2f61119c Change Bluetooth apex mountpoint
Apex name has been changed to com.android.btservices
Changing mount point accordingly
Bug: 235892590
Test: Flash / boot bt / look logs & pair a device

Change-Id: I1e32f26c5e2b121391bc85c6b50b2ccdf57ff5de
2022-06-22 13:19:47 -07:00
Oriol Prieto Gascó
e0d52fdf27 Merge "Use the btservices apex for bluetooth stack" into tm-dev am: ac0f3f2211
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18985505

Change-Id: I0e051e73b94040a34d135e6421ee9c5f3f835638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 17:45:18 +00:00
Oriol Prieto Gascó
ac0f3f2211 Merge "Use the btservices apex for bluetooth stack" into tm-dev 2022-06-22 17:18:44 +00:00
Bassem Khalife
ac2a43a933 [automerger skipped] Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f am: 5c3a73607d -s ours am: 8634e5b861 -s ours
am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 2489eee173 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: Idd9bf7227f873ffb20ecc327e8c9a4d2a2b7c8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:45:50 +00:00
Bassem Khalife
8634e5b861 [automerger skipped] Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f am: 5c3a73607d -s ours
am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 2489eee173 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: I2d95ee0e2dfd53835237c4cbf1d6b7a850ce5b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:08:41 +00:00
Bassem Khalife
f8f31a9ca7 [automerger skipped] Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f am: 1a14749420 -s ours am: 1c7d177fd9 -s ours am: 61a0d7088c -s ours
am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 52fd4edb47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: I614880d3f7a960448653f75f5ee7c2e5ba8aeb0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 20:18:01 +00:00
Bassem Khalife
61a0d7088c [automerger skipped] Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f am: 1a14749420 -s ours am: 1c7d177fd9 -s ours
am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 52fd4edb47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: I34f0eb19d641e1194f275af7da6a505123e80d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 19:58:48 +00:00
Bassem Khalife
1c7d177fd9 [automerger skipped] Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f am: 1a14749420 -s ours
am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 52fd4edb47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: I3b2f525ebfe6abf8384dc4318b7d27026f8b7f89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 19:34:17 +00:00
Bassem Khalife
1a14749420 Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: I746304aa9a455c69126662617dd8a0ba893a86e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 19:09:24 +00:00
Bassem Khalife
5c3a73607d Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: 7966d37150 am: 6e41c8bb4d am: 7f1af3280f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: Ic09aed654941dd36de79b2ae6966ab7552217ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 19:08:17 +00:00
Bassem Khalife
7f1af3280f Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: 7966d37150 am: 6e41c8bb4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: I262b4141ad207cbba0d42c516dc6713ff6fe167a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 18:51:10 +00:00
Bassem Khalife
6e41c8bb4d Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd am: 7966d37150
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: I716d2d011ca60e7fbde662edf57e427e07c1c4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 18:24:32 +00:00
Bassem Khalife
7966d37150 Update Security String to 2022-08-01 am: 2489eee173 am: 7c7ea70abd
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: I3d2518edb16ff2cf259640ce2c6612fc2fe587cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 18:06:57 +00:00
Bassem Khalife
7c7ea70abd Update Security String to 2022-08-01 am: 2489eee173
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18916487

Change-Id: I9558ac59a1d2b8012bc68c979842d3c20cc8580e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 17:50:01 +00:00
Bassem Khalife
7b96b69939 [automerger skipped] Update Security String to 2022-08-01 am: 52fd4edb47 -s ours am: 080e4d7642 -s ours
am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 9f2be867c4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19002854

Change-Id: I7fcc39ace87ebae33e3d1a0bed886de69a8e273c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 17:15:19 +00:00
Bassem Khalife
080e4d7642 [automerger skipped] Update Security String to 2022-08-01 am: 52fd4edb47 -s ours
am skip reason: Merged-In Ief202c2f8b37d686397560df599d2143d763ba65 with SHA-1 9f2be867c4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19002854

Change-Id: I57ffd10f012de2502d7835bcb3b7dd6b9d46dcc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:56:25 +00:00
Bassem Khalife
52fd4edb47 Update Security String to 2022-08-01
Bug: 232157623

Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
Merged-In: Ief202c2f8b37d686397560df599d2143d763ba65
2022-06-21 05:32:32 +00:00
Oriol Prieto Gasco
bfd1aa30f5 Use the btservices apex for bluetooth stack
Test: TH

Bug: 236187653, 236192423

Change-Id: Id57f3e86f243948d3ea21c6e1a7150ab07c317b5
2022-06-19 23:04:56 +00:00
Bassem Khalife
fc9bd27315 Update Security String to 2022-08-05 am: 9f2be867c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18911707

Change-Id: I86b18027a966cf8f9e025b1a96903b4bdebeffa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:09:04 +00:00
Bassem Khalife
2489eee173 Update Security String to 2022-08-01
Bug: 232157623

Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
Merged-In: Ief202c2f8b37d686397560df599d2143d763ba65
2022-06-15 22:02:46 +00:00
Bassem Khalife
9f2be867c4 Update Security String to 2022-08-05
Bug: 232157623
Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
2022-06-15 21:58:56 +00:00
Anton Hansson
3b8b585235 Merge "Don't exclude docs build from using prebuilts" into tm-dev am: 29ae21ebb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18886329

Change-Id: I0881192ed5d9b848bef4120bb76b0028cf1760e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 18:21:03 +00:00
Anton Hansson
29ae21ebb7 Merge "Don't exclude docs build from using prebuilts" into tm-dev 2022-06-15 17:59:25 +00:00
Bob Badour
e4e87592ef Merge changes from topic "revert-18821068-NTXTBFFANH" into tm-dev am: 0e729cfc1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18874017

Change-Id: I41d296178d89569e08be9282fe5fd5bd85603ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:55:20 +00:00
Bob Badour
b6df81743b Revert "Record license text for every dist target." am: 29d723fb4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18874016

Change-Id: Ibce406a8e034bad7ae3baccc76de49f53fc38044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:55:18 +00:00
Bob Badour
0e729cfc1d Merge changes from topic "revert-18821068-NTXTBFFANH" into tm-dev
* changes:
  Revert "Create lists of projects to share per dist target"
  Revert "Record license text for every dist target."
2022-06-14 14:48:48 +00:00
Anton Hansson
ad0ef270db Don't exclude docs build from using prebuilts
Even though it doesn't have google modules in PRODUCT_PACKAGES,
the docs build wants to use prebuilts when the rest of the branch
does.

Bug: 230478310
Test: m docs (inspect MODULE_BUILD_FROM_SOURCE)
Change-Id: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
2022-06-14 13:43:37 +00:00
Bob Badour
7960535739 Revert "Create lists of projects to share per dist target"
Revert submission 18821068

Reason for revert: Advised to switch to using TARGET_BUILD_APPS
Reverted Changes:
Ibd737c0dd:Record license text for every dist target.
Ibf5a9869d:Create lists of projects to share per dist target

Change-Id: I4a2c7b3c74b446ce3748217be30da70c060da0dd
Merged-in: If56a1fceb5da66b90b7b0ec2275ec429661515b4
2022-06-13 21:03:40 +00:00
Bob Badour
29d723fb4a Revert "Record license text for every dist target."
Revert submission 18821068

Reason for revert: Advised to switch to using TARGET_BUILD_APPS
Reverted Changes:
Ibd737c0dd:Record license text for every dist target.
Ibf5a9869d:Create lists of projects to share per dist target

Change-Id: Ib0007bf6989c25cc2503f8feac35682d13f0a2b7
Merged-in: I1442998bbafe909a0796abdb2e9691a0c4c099d6
2022-06-13 21:02:22 +00:00
Paul Duffin
e1cd1aee73 Add bluetooth and uwb to the optional modules list am: 70a11a34c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18839974

Change-Id: I6c37d464a9fa1ef4db5315dd6f8a6f42bcd7de4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:13:24 +00:00
Paul Duffin
6c34d6e953 Add wifi_module/source_build Soong config variable am: 9a5e3d53a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18850363

Change-Id: I4b57296ab2b7ca5f00e3c162ddd9effdfeda8875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:13:19 +00:00
Paul Duffin
70a11a34c0 Add bluetooth and uwb to the optional modules list
Bug: 233965247
Test: m nothing
Change-Id: I9618844499d6f1da4d5e9b5b31bfaca86c4de980
2022-06-11 12:24:38 +00:00
Paul Duffin
9a5e3d53a8 Add wifi_module/source_build Soong config variable
As an optional module, wifi has its own Soong config variable. This
change ensures that it is controlled by the same environment variable
as the rest of the modules.

Bug: 233965247
Test: # Unpack wifi snapshot that uses wifi specific Soong config.
      m nothing
      # Without this the build fails as it uses the wifi prebuilts
      # which do not work in AOSP.
      # With this change the build passes as it uses the wifi
      # sources.
Change-Id: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08
(cherry picked from commit 4f4b6d776d)
Merged-In: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08
2022-06-11 12:17:02 +00:00
TreeHugger Robot
4351888548 Merge changes Ibd737c0d,Ibf5a9869 into tm-dev am: 52a972709d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18821068

Change-Id: I8b92a4c0baf40570452cff3c310ccf1a8c36c8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 23:53:01 +00:00
Bob Badour
d5ded6089c Create lists of projects to share per dist target am: 570381b746
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18821067

Change-Id: Ia778fa28954a94bfc7389a9e1467d6d902f981d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 23:52:59 +00:00
TreeHugger Robot
52a972709d Merge changes Ibd737c0d,Ibf5a9869 into tm-dev
* changes:
  Record license text for every dist target.
  Create lists of projects to share per dist target
2022-06-10 23:18:09 +00:00
TreeHugger Robot
bcaafa071b Merge "Improve flags for compliance tools." into tm-dev am: 99b87147ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18821066

Change-Id: Ib8acb5ab9e726c22121a36cea12aa3187ff9d899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:47:23 +00:00
Bob Badour
436cc6bd2d Fix license package name and provide license text. am: b5353a160b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18816793

Change-Id: I40f9c311c3613bad028428c40800a82418139f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:46:55 +00:00
TreeHugger Robot
99b87147ec Merge "Improve flags for compliance tools." into tm-dev 2022-06-10 19:18:51 +00:00
Bob Badour
6a661f011d Record license text for every dist target.
Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests

Change-Id: Ibd737c0dd0a35e19529ab08472f4d1bc1195efbd
Merged-in: Ibd737c0dd0a35e19529ab08472f4d1bc1195efbd
2022-06-09 15:38:32 -07:00
Bob Badour
570381b746 Create lists of projects to share per dist target
Bug: 151177513
Bug: 210912771
Bug: 235333302

Test: m droid dist reportmissinglicenses

Change-Id: Ibf5a9869d03726e279fb23bf68ca66547b972138
Merged-in: Ibf5a9869d03726e279fb23bf68ca66547b972138
2022-06-09 15:38:21 -07:00
Bob Badour
ccf947490c Improve flags for compliance tools.
Bug: 235333302

Test: m droid dist reportmissinglicenses

Change-Id: I4090dae3d5d33d1908d67dff31aeee92d2b261da
Merged-in: I4090dae3d5d33d1908d67dff31aeee92d2b261da
2022-06-09 15:38:14 -07:00
Bob Badour
b5353a160b Fix license package name and provide license text.
Bug: 235331488

Test: m droid dist

Change-Id: Ic450732083773668bf9d9d0e1fffa1852f88ab45
Merged-in: Ic450732083773668bf9d9d0e1fffa1852f88ab45
2022-06-09 06:42:42 -07:00
Paul Duffin
b6b7d9c791 Disable prebuilts when building with clang coverage am: f372ce1415
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18601940

Change-Id: I9c2e484728e2299a17c5ee0a145a304e84610848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 17:32:09 +00:00
Paul Duffin
f372ce1415 Disable prebuilts when building with clang coverage
Prebuilts broke the cf_x86_phone-userdebug_coverage_bionic
on tm-release build.

Bug: 230478310
Bug: 223592962
Test: presubmit
Merged-In: I3ed091156c4b39dad6eaf578144ac3d070025988
Merged-In: I9731400acfade95b3eab8f2d99fddb4cf856aa91
Merged-In: I6eca2fcc670dccef4a6cd9dc3f08003eb47e5bca
Change-Id: I40c10e88b824e5f4b783b1dc0a500096fad209b2
2022-05-31 17:10:41 +00:00
Anton Hansson
8664fe16af Merge changes from topic "sdk-refactor-tmd" into tm-dev am: e59bd2aa7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18598732

Change-Id: I1215d9e305df50acb07eeec7bf2d2775c7d53d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:47:14 +00:00