Commit Graph

8221 Commits

Author SHA1 Message Date
Hassan Ali
0b51b8c29d Add configinfrastructure to bootclasspath
Test: m configinfrastructure-sdk
Bug: 248552678
Change-Id: Id241ab2a547685d0ac47ca60e5e659ff43cff70f
2022-10-05 13:14:15 +00:00
Treehugger Robot
5091a89751 Merge "Also copy init.zygote64.rc for 64-bit primary 32-bit secondary targets." am: 694cb51d7e am: 375427bd4d am: f81bb83d10 am: c84bf73230 am: 324c7e0567
Original change: https://android-review.googlesource.com/c/platform/build/+/2241356

Change-Id: I9c0418d339f4af2505b7e8f0fe11f46f1b10d54b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 23:44:44 +00:00
Treehugger Robot
324c7e0567 Merge "Also copy init.zygote64.rc for 64-bit primary 32-bit secondary targets." am: 694cb51d7e am: 375427bd4d am: f81bb83d10 am: c84bf73230
Original change: https://android-review.googlesource.com/c/platform/build/+/2241356

Change-Id: I2b1977cbf22f0beb7f2472c5a2bb0cb6150789ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 23:16:32 +00:00
Treehugger Robot
1a56449563 Merge "Retire emulator.mk" am: 7af526f93f am: a005fa4e87 am: 0ee4c4cfa9 am: b9dc536e17 am: 1190099822
Original change: https://android-review.googlesource.com/c/platform/build/+/2241353

Change-Id: Ibd2050f8143b3ffc0e6daf17a37804ce3fb0ff8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 22:20:18 +00:00
Treehugger Robot
1190099822 Merge "Retire emulator.mk" am: 7af526f93f am: a005fa4e87 am: 0ee4c4cfa9 am: b9dc536e17
Original change: https://android-review.googlesource.com/c/platform/build/+/2241353

Change-Id: I1fe34a7097d785925842b76b6a68ed6618befe19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 22:19:44 +00:00
Treehugger Robot
694cb51d7e Merge "Also copy init.zygote64.rc for 64-bit primary 32-bit secondary targets." 2022-10-04 21:14:37 +00:00
Peter Collingbourne
58a7f29c21 Also copy init.zygote64.rc for 64-bit primary 32-bit secondary targets.
Bug: 250705777
Change-Id: I59563d4907bb91fcdb17dbe5d687411cf8be7031
2022-10-04 11:31:57 -07:00
Roman Kiryanov
d9bbd880fd Retire emulator.mk
use emulator_vendor.mk instead

Bug: 250696437
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ib770efb32fdf014d8ffa20ec34485d3235036a4a
2022-10-04 10:34:36 -07:00
Qiao Li
2ab16e59bc Merge "Add federatedcompute in build branch" 2022-09-30 16:46:00 +00:00
Sandro Montanari
459a16efd9 Merge "Rollback "Make com.android.sepolicy mandatory"" am: 1bcc569e14 am: 152c8ffb55 am: b4093a65c2 am: 72d96fe42a am: 489181f360
Original change: https://android-review.googlesource.com/c/platform/build/+/2215049

Change-Id: I57777dedacf6f36f4a3dd83ff7bc218c633b564f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 12:58:51 +00:00
Sandro Montanari
489181f360 Merge "Rollback "Make com.android.sepolicy mandatory"" am: 1bcc569e14 am: 152c8ffb55 am: b4093a65c2 am: 72d96fe42a
Original change: https://android-review.googlesource.com/c/platform/build/+/2215049

Change-Id: I85fb69a49edf8cc13e3cb733cb6032cbb649582d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 10:39:30 +00:00
Sandro
d571ca6d4a Rollback "Make com.android.sepolicy mandatory"
Rolling back the changes from aosp/2199179.

Bug: 243923977#comment9
Test: adb shell ls /dev/selinux /system/etc/selinux
Change-Id: If205f106230c2f076f72396011b68079ddd4d253
2022-09-26 11:49:30 +00:00
qiaoli
60cc7b6423 Add federatedcompute in build branch
Test: TH
Bug: 244640209
Change-Id: I23b0809c11e3c6189a467c8e2cd7a1375425e3ac
2022-09-23 23:54:10 +00:00
Anna Zhuravleva
992fb169bc Merge "Add Health Connect library to system server jars." 2022-09-12 11:30:47 +00:00
Anna Zhuravleva
e4b7aa86e4 Merge "Add healthconnect library to bootlcasspath." 2022-09-09 10:24:19 +00:00
Anton Hansson
9468ea824a Merge "Make banchan support arm64only and x86_64only" am: 59699234bc am: bf6553e9dd am: ce377be68d am: 49fda11626 am: c7c6dc711b
Original change: https://android-review.googlesource.com/c/platform/build/+/2207697

Change-Id: I48cf79b2fac7ea85c16e7bd641e1bc5e0e14dbfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 14:07:38 +00:00
Inseob Kim
479c3b2339 Merge "Check same vndk variants when builing vndk_package" am: 5c60e24509 am: f396dd153b am: 73044c9127 am: c2aafc7ca5 am: 3c37a83f8d
Original change: https://android-review.googlesource.com/c/platform/build/+/2208858

Change-Id: If647d84241d9abe70a05082f72a784746a877b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 14:04:56 +00:00
Anton Hansson
c7c6dc711b Merge "Make banchan support arm64only and x86_64only" am: 59699234bc am: bf6553e9dd am: ce377be68d am: 49fda11626
Original change: https://android-review.googlesource.com/c/platform/build/+/2207697

Change-Id: I6e9509f41564ac192bdb1103a5dfe5fdc935f0cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 13:35:46 +00:00
Inseob Kim
3c37a83f8d Merge "Check same vndk variants when builing vndk_package" am: 5c60e24509 am: f396dd153b am: 73044c9127 am: c2aafc7ca5
Original change: https://android-review.googlesource.com/c/platform/build/+/2208858

Change-Id: I59aaab69712e4942118cbe0b956266e7007bac8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 13:34:23 +00:00
Anna Zhuravleva
dede1b9f77 Add Health Connect library to system server jars.
Bug: 245722029
Test: build
Change-Id: Ice145e15d876b5f37ffb6a071afbb36b106be26a
2022-09-08 13:25:48 +00:00
Anton Hansson
59699234bc Merge "Make banchan support arm64only and x86_64only" 2022-09-08 10:57:34 +00:00
Inseob Kim
5c60e24509 Merge "Check same vndk variants when builing vndk_package" 2022-09-08 09:31:25 +00:00
Anton Hansson
533fb45b9a Merge "add module_x86_64only product" am: fe9d1d316d am: 3f5b7c3dbb am: e180270b7a am: 19855615d5
Original change: https://android-review.googlesource.com/c/platform/build/+/2207696

Change-Id: Ia71a2c03f9c39083eef956f9bd8471834d9cae07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 14:26:51 +00:00
Anton Hansson
5cc0b4ff73 Merge "add module_arm64only product" am: 25ce929205 am: 8483fca791 am: 5dbfdae92b am: 1b52ed8def
Original change: https://android-review.googlesource.com/c/platform/build/+/2207695

Change-Id: Ie71bec036a01f13efb0044287814eed150030d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 13:32:00 +00:00
Inseob Kim
ad503c265c Check same vndk variants when builing vndk_package
Since the vndk apex is introduced, same vndk variants check has stopped
when building vndk_package, and it's performed only with checkbuild.

Bug: 244654349
Test: m vndk_package
Change-Id: Iee30b5df75565c024f93d40bc6eaa7a729c2e09c
2022-09-07 20:02:30 +09:00
Anton Hansson
90ac61c8b6 Make banchan support arm64only and x86_64only
Test: banchan arm64only
Test: banchan x86_64only
Change-Id: I1a787a4c5d80db18d7712d257e196dc19f3496b7
2022-09-06 16:26:10 +00:00
Sam Delmerico
eab83032ae 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
Merged-In: I906f6cd10882986c8182ed16916e07c0f0d8b32e
2022-09-06 14:35:03 +00:00
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