Commit Graph

8638 Commits

Author SHA1 Message Date
Neha Jain
e4098f4648 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e am: df039120bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: I8eb0e4c7cceb3d4d7b2b21ebfea57682ad42b0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 02:47:36 +00:00
Neha Jain
3505f2b3a4 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main 2023-07-13 00:24:18 +00:00
Neha Jain
9926178660 Revert "Enable CFI for the whole Bluetooth repo and not just system"
This reverts commit d759b3517a.

Reason for revert: b/289779264

Change-Id: If7bdba6a420f2a310ad86b7b3b44eba5111c5d69
2023-07-12 23:16:25 +00:00
Roman Kiryanov
501fce7eef Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6 am: f1fc68b180 am: 931b7ca52f
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583

Change-Id: If12221540df5c5e14d78ab296d383616a9908844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 05:19:32 +00:00
Treehugger Robot
5cc6f5d6f9 Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5 am: 712109c1f2 am: 9709297328
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582

Change-Id: Ic7d95d07dd81326d54acd565e7a0374d54d8e42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 00:08:23 +00:00
Roman Kiryanov
f945b5df68 (reland2) Remove emulator dependencies on non emulator targets (2)
the sidecar issue in GSI was fixed.

Bug: 111538404
Test: presubmit
Change-Id: Ia48ce2e076edc4f13f85e58d9bbbe15b8e6a4438
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-07-11 14:16:35 -07:00
Roman Kiryanov
3a3b121154 Remove the X attribute from .mk files
Bug: 111538404
Test: presubmit
Change-Id: Iefd39e76559ec25c4bdd98893dfc593816da5077
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-07-11 14:16:35 -07:00
Elliott Hughes
7a75419a51 Merge "Switch from minigzip to gzip." into main am: c1577ff58b am: f94ff9146d am: d9cdcba928
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009

Change-Id: I9e0fe8aff864b5423a0a9c066838e76c1cea98a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 18:25:43 +00:00
Elliott Hughes
c1577ff58b Merge "Switch from minigzip to gzip." into main 2023-07-11 15:52:27 +00:00
Kangping Dong
7da60868fd Merge "add com.android.threadnetwork to base_system.mk" am: 235662f15a am: a0e4fab6f0 am: d1ef7f4487
Original change: https://android-review.googlesource.com/c/platform/build/+/2645819

Change-Id: Iaa48747f615b2d39e5e05b12d5a0ec28c6d3b129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 04:10:06 +00:00
Kangping Dong
235662f15a Merge "add com.android.threadnetwork to base_system.mk" 2023-07-04 01:52:46 +00:00
Kangping Dong
286e55ad94 add com.android.threadnetwork to base_system.mk
Bug: 262683651
Test: atest CtsSystemApiSignatureTestCases
Merged-In: Iefe7fa4c74ab9608faeb9d64e75c054e9b90afdb
Change-Id: Id4f34b70aee2277236762092f8a40254963a6b4f
2023-07-03 17:24:05 +08:00
Louis Chang
886ad7a862 Adds Window Extensions to GSI
... in order to have window extension library included
especially on large screen devices.

Bug: 288624195
Test: atest SdkAvailabilityTest
Ignore-AOSP-First: Future release
Change-Id: I8d347917f002cefb4f297930370ac7ae847f4731
2023-07-03 13:29:20 +08:00
Chris Li
28776f06c9 Merge "Adds Window Extensions to GSI" into udc-dev am: 3eda5ebeb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23560276

Change-Id: Idbc3fd08cd12612bae5326c64a1e835ad83f873a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 03:25:56 +00:00
Chris Li
3eda5ebeb3 Merge "Adds Window Extensions to GSI" into udc-dev 2023-07-01 02:41:48 +00:00
Treehugger Robot
dba92e58d5 Merge "Enable CFI for the whole Bluetooth repo and not just system" am: 03bc41cae7 am: 3f10714916 am: 571c6284fa
Original change: https://android-review.googlesource.com/c/platform/build/+/2645203

Change-Id: I985f603095452bae4bf661a01e96c0925bea4272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 00:10:35 +00:00
Treehugger Robot
03bc41cae7 Merge "Enable CFI for the whole Bluetooth repo and not just system" 2023-06-30 22:04:30 +00:00
Ulya Trofimovich
1f4f71f06f Merge "Add riscv64 banchan target." am: 40b9ac7ee5 am: 6270916eff am: 975e0ef22b
Original change: https://android-review.googlesource.com/c/platform/build/+/2622111

Change-Id: Ieda98d64aaf62bdee7b5dfd287fea14ecb5856f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 15:36:26 +00:00
David Duarte
d759b3517a Enable CFI for the whole Bluetooth repo and not just system
Bug: 282222542
Change-Id: Idd0e0c4ab01e703190038c103b41730d68f01be0
2023-06-29 21:01:48 +00:00
Ulya Trafimovich
08c381b8b2 Add riscv64 banchan target.
Test: banchan riscv64 com.android.art
Test: build/soong/build_test.bash --dist -products module_riscv64
Bug: 271573990
Change-Id: I6aa8c51b1a1928b3da52a9345a8bfb84e3eb11d0
2023-06-28 13:58:30 +01:00
Elliott Hughes
97ad120adb Switch from minigzip to gzip.
Bug: http://b/288169261
Test: treehugger
Change-Id: I404cbcb850734ed8291c2215a4329fb372806d63
2023-06-27 15:39:05 -07:00
Louis Chang
fb617dd880 Adds Window Extensions to GSI
... in order to have window extension library included
especially on large screen devices.

Bug: 288624195
Test: atest SdkAvailabilityTest
Ignore-AOSP-First: Future release
Change-Id: I8d347917f002cefb4f297930370ac7ae847f4731
2023-06-27 09:47:35 +00:00
Treehugger Robot
adb009c0f5 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb am: 1ff91ea214
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I072e9977c10ea905c82ed7fddb27431447155b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:35:55 +00:00
Treehugger Robot
2a477ccdbb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I26c965b0079dacc14c1b4a83ce545a919d7f33cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:08:08 +00:00
Treehugger Robot
d0c29cbdeb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" 2023-06-21 05:18:58 +00:00
Jooyung Han
8cc42f429f Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
We will deprecate flattened apexes. In this change, GSI-specific make
variable (PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES) is removed. The
variable was used to install both image/flattened apexes in the GSI, so
that it works on ro.apex.updatable devices and not-updatable devices.

Now, GSI will have only image APEXes in it.

Bug: 278826656
Test: lunch gsi_arm64-userdebug && m # no flattened apexes
Change-Id: I4702973d4ee75aa693e4e7f4e57577b77059dc09
2023-06-20 14:27:10 +09:00
Treehugger Robot
3820741906 Merge "Move ro.apex.updatable to the system partition" am: 770bfc34e3 am: 0e3d0523bf am: 416c3d676f
Original change: https://android-review.googlesource.com/c/platform/build/+/2627769

Change-Id: I2281159f8cdece3a4dcfa357318f8cd349ac9ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 10:45:24 +00:00
Treehugger Robot
0e3d0523bf Merge "Move ro.apex.updatable to the system partition" am: 770bfc34e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2627769

Change-Id: I23bcbd5565fb5eda0848b6d5fac0f95a6642c22f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 09:16:55 +00:00
Treehugger Robot
770bfc34e3 Merge "Move ro.apex.updatable to the system partition" 2023-06-19 08:30:52 +00:00
Treehugger Robot
da57569022 Merge "Update LLNDK list" am: 1cda03b44b am: bb4fddb723 am: c40905e759
Original change: https://android-review.googlesource.com/c/platform/build/+/2623809

Change-Id: I7860f2b24708ba213527140da00aaf9a4cdad383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 08:01:03 +00:00
Treehugger Robot
bb4fddb723 Merge "Update LLNDK list" am: 1cda03b44b
Original change: https://android-review.googlesource.com/c/platform/build/+/2623809

Change-Id: I66514a5e139d4686e4f7127a42b1c75c11b529af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 06:31:39 +00:00
Treehugger Robot
1cda03b44b Merge "Update LLNDK list" 2023-06-15 04:26:43 +00:00
Jiyong Park
36fc9a32d7 Move ro.apex.updatable to the system partition
The decision to support updatable APEX or not used to be SoC-specific
because updatable APEX (aka non-flattened APEX) requires some kernel
feature support like loopback device. Kernel was considered as part of
BSP then. Therefore, ro.apex.updatable property was in the vendor
partition.

However, with GKI, kernel is no longer SoC-specific. And most APEXes are
installed to the system partition, which means that the decision affects
how the system partition is built. Thus, this CL moves the property to
the system partition. This enables some partners who have been using
flattened APEX to be able to upgrade to non-flattened APEX without
having to upgrade the vendor partition.

Bug: 281007951
Test: check system/build.prop
Change-Id: I81874076862f6047b9daa14518b95adcb5275064
2023-06-15 13:20:38 +09:00
Treehugger Robot
4e9fe359d6 Merge "Move MTE mode settings to a product variable." am: c37e824f56 am: ec810624c2 am: 57a758393e
Original change: https://android-review.googlesource.com/c/platform/build/+/2622658

Change-Id: Id114e0cc956d1257241f08930bac54882696bc99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:02:48 +00:00
Treehugger Robot
ec810624c2 Merge "Move MTE mode settings to a product variable." am: c37e824f56
Original change: https://android-review.googlesource.com/c/platform/build/+/2622658

Change-Id: I8dbb33a6f23421e43f27cb54aa88f39f4dab8e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 02:33:07 +00:00
Florian Mayer
8bb740db1a Add aosp_arm64_fullmte target
Test: lunch aosp_arm64_fullmte && m
Test: llvm-readelf -a out/target/product/generic_arm64/system/bin/toybox
  Memtag Android Note:
      Tagging Mode: SYNC
      Heap: Enabled
      Stack: Enabled

Bug: 271768933
Bug: 286415307
(cherry picked from https://android-review.googlesource.com/q/commit:0352c44ab37cd06d3cd7b52dbac2bb73971f366e)
Merged-In: I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e
Change-Id: I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e
2023-06-13 20:18:03 +00:00
Evgenii Stepanov
80b53b8c77 Move MTE mode settings to a product variable.
Allow product configuration of memtag target list by
moving the current set into a product variable instead of the various
.bp files.

The default list of memtag targets can be found in
  build/make/target/product/memtag-common.mk

This is NFC as all targets in the list already have "memtag_heap: true"
in the build files.

Bug: 280343521
Test: no functional change
Change-Id: I5954fde05256e00a8e01c114ad522f50ed0cfa9f
2023-06-13 13:11:52 -07:00
Jooyung Han
bd7a9fafe2 Update LLNDK list
Bug: 271488212
Test: m
Change-Id: I46e1770130be203bfefef0bd5fdf4cec34027d6e
2023-06-13 13:20:23 +09:00
Florian Mayer
cc98482738 Merge "Add aosp_arm64_fullmte target" am: 9066ab5240 am: 34ed46e626 am: 6956735a5a
Original change: https://android-review.googlesource.com/c/platform/build/+/2617516

Change-Id: I7c5941f01523d8539dc9b58d5e3f7b925fa3ecd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-10 02:02:48 +00:00
Florian Mayer
34ed46e626 Merge "Add aosp_arm64_fullmte target" am: 9066ab5240
Original change: https://android-review.googlesource.com/c/platform/build/+/2617516

Change-Id: Id57d362e61bb4df8a5f8e7c70f3cb990db3c6524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-10 00:34:38 +00:00
Florian Mayer
9066ab5240 Merge "Add aosp_arm64_fullmte target" 2023-06-09 23:59:52 +00:00
Florian Mayer
0352c44ab3 Add aosp_arm64_fullmte target
Test: lunch aosp_arm64_fullmte && m
Test: llvm-readelf -a out/target/product/generic_arm64/system/bin/toybox
  Memtag Android Note:
      Tagging Mode: SYNC
      Heap: Enabled
      Stack: Enabled

Bug: 271768933
Bug: 286415307
Change-Id: I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e
2023-06-09 18:17:47 +00:00
Treehugger Robot
e80e8b4c5c Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a am: 7613afc5ae am: 1b805513cc
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I4dad5a6ab484b68f53f1636634a7d98ea6073963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 00:47:10 +00:00
Treehugger Robot
7613afc5ae Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I62ffc6c79b1b472e3a25c3b80f88ef26f3507ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 23:32:09 +00:00
Treehugger Robot
a85c8a863a Merge "BOARD_VNDK_VERSION must be set first pass" 2023-06-08 23:19:34 +00:00
Steven Moreland
78549acb47 BOARD_VNDK_VERSION must be set first pass
Removing all places that consider that this might not be
set.

Bug: 122954981
Test: build
Change-Id: I62107d041410f4ee1d3652e394ed5e7688c12f25
2023-06-07 20:57:38 +00:00
Seigo Nonaka
c874637cfa Merge "Include RobotoFlex into AOSP system image" am: 52b65fef51 am: 7017c9a918 am: c6b25f39d9
Original change: https://android-review.googlesource.com/c/platform/build/+/2606566

Change-Id: I9364f24d5e246f957506fec88ed6cd699987adf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 04:39:47 +00:00
Seigo Nonaka
7017c9a918 Merge "Include RobotoFlex into AOSP system image" am: 52b65fef51
Original change: https://android-review.googlesource.com/c/platform/build/+/2606566

Change-Id: I0274fbe39d7b6f19c486e22a62f79f203187052a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 02:52:15 +00:00
Seigo Nonaka
52b65fef51 Merge "Include RobotoFlex into AOSP system image" 2023-06-07 02:14:27 +00:00
Treehugger Robot
86c394f1c1 Merge "Do not include SoundPicker on Android TV" am: 05e0a133aa am: 2939790301 am: 14396e5797
Original change: https://android-review.googlesource.com/c/platform/build/+/2604845

Change-Id: Ie69e19ee9d958f73303753aba85ed135a6255a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 01:41:14 +00:00