StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,226 Commits 1 Branch 0 Tags
2a19321e3d86f23f35bf67c22885c64dae7b51d8
Commit Graph

9079 Commits

Author SHA1 Message Date
Treehugger Robot
0618ddc25a Merge "Retire obsolete emulator targets and boards" into main am: 0559341ecc am: 0a85208705 am: faea3629f7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2811493

Change-Id: Ifa228df836c135bb397d871da9cba583d755f3b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 19:04:22 +00:00
Treehugger Robot
cc7a8b267d Merge "Retire obsolete emulator targets and boards" into main am: 0559341ecc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2811493

Change-Id: Ie9da339d869e8b03c58ce0dd73e521fbbd19c7ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 18:31:38 +00:00
Treehugger Robot
faea3629f7 Merge "Retire obsolete emulator targets and boards" into main am: 0559341ecc am: 0a85208705 
Original change: https://android-review.googlesource.com/c/platform/build/+/2811493

Change-Id: I882ba80274be8e2fe52bee1b9858e40cfcbf6aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 18:27:29 +00:00
Treehugger Robot
0559341ecc Merge "Retire obsolete emulator targets and boards" into main 2023-10-31 17:54:03 +00:00
Roman Kiryanov
4bf479f605 Retire obsolete emulator targets and boards 
the sdk_phone* targets are replaced with sdk_phone64*,
the emulator* boards are replaced with emu64* in
the device/generic/goldfish folder.

Bug: 295259752
Test: presubmit
Change-Id: I069a06baf02aea30db617f183abbfeaa6f968f29
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-10-31 09:49:07 -07:00
Harshit Mahajan
4c8cdb4025 Merge "Revert "[CrashRecovery] Add module to BCP and SSCP"" into main 2023-10-31 12:34:41 +00:00
Treehugger Robot
b5f372eb96 Merge "Move vndk apex to the vendor partition for in-development builds" into main am: 32500b007f am: 7fb57226ce am: 54d387f791 
Original change: https://android-review.googlesource.com/c/platform/build/+/2809201

Change-Id: I2f30689862ced37f838c3b3efbf66b114cad6220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 05:30:00 +00:00
Treehugger Robot
7fb57226ce Merge "Move vndk apex to the vendor partition for in-development builds" into main am: 32500b007f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2809201

Change-Id: Ifd339125bcff6b07ddbf06653767388500c35097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 04:27:01 +00:00
Harshit Mahajan
d9199eb8ed Revert "[CrashRecovery] Add module to BCP and SSCP" 
Revert submission 24444827-crashrecovery

Reason for revert: Since the module is not behind any flags, it is getting included in 24Q1 Beta release.

Reverted changes: /q/submissionid:24444827-crashrecovery
Bug: b/305826937
Change-Id: I39dfab62897d907023720b594d6929397403d314
 2023-10-30 17:47:26 +00:00
Justin Yun
9222bcb9f0 Move vndk apex to the vendor partition for in-development builds 
We may now install VNDK apex on vendor partition safely as product
modules no longer requires vndk libs.

Bug: 299867815
Bug: 307214977
Test: lunch cf_x86_64_phone-trunk_staging-userdebug; m
Change-Id: Ibc2391c326a392644e251d2938adedbdf8b23630
 2023-10-30 16:51:31 +09:00
Treehugger Robot
e1c5cfde46 Merge "Remove emulator_x86_arm board from common boards" into main am: 4fd3b11018 
Original change: https://android-review.googlesource.com/c/platform/build/+/2808362

Change-Id: I7465d29e2cfc1f7ef1ae58fbe2795f5ae3997378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-27 23:14:53 +00:00
Treehugger Robot
4fd3b11018 Merge "Remove emulator_x86_arm board from common boards" into main 2023-10-27 22:36:11 +00:00
Alfred Piccioni
bd523029a9 Remove emulator_x86_arm board from common boards 
The board will now live in the Android TV vendor partition, since the
emulator team is no longer supporting 32-bit boards.

Bug: 305610937
Test: Null
Change-Id: Ia1afb35ad15eb991bb2451c160db4f853f016587
Merged-In: Ia1afb35ad15eb991bb2451c160db4f853f016587
 2023-10-27 18:58:37 +00:00
Treehugger Robot
b7c0adf543 Merge "Remove emulator_x86_arm board from common boards" into main 2023-10-26 18:09:01 +00:00
Alfred Piccioni
e2ac8b19c4 Remove emulator_x86_arm board from common boards 
The board will now live in the Android TV vendor partition, since the
emulator team is no longer supporting 32-bit boards.

Bug: 305610937
Test: Null
Change-Id: Ia1afb35ad15eb991bb2451c160db4f853f016587
Ignore-AOSP-First: this will be cp'ed to AOSP soon after
 2023-10-26 18:06:27 +00:00
Treehugger Robot
942b06c7e3 Merge "Fix lunch choices for git_main" into main am: 3d79e54ff1 am: bf665a1fa6 am: aa454138c8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802547

Change-Id: Ifffed54b915c7d07ddcab6c043dd27c592390e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 23:49:42 +00:00
Treehugger Robot
bf665a1fa6 Merge "Fix lunch choices for git_main" into main am: 3d79e54ff1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802547

Change-Id: I5312f186611997b3d8a4467f7a34fdaa1632c72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 22:54:14 +00:00
Greg Kaiser
0fe27f448b Fix lunch choices for git_main 
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
Change-Id: I7d56b288355d1335db5297ad9b5117054caf365b
 2023-10-25 21:28:57 +00:00
Jared Duke
00629ca4e3 Merge "Remove viewcompiler binary inclusion" into main 2023-10-25 21:20:44 +00:00
Anton Hansson
d97c0b00d3 Merge "m framework-minus-apex should not build services" into main am: ef5a9ea7ef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2801833

Change-Id: I3c5ba183e00d2c7478a85a70ab3fd4504bcc0515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 17:07:52 +00:00
Mark White
cc8b4dd471 m framework-minus-apex should not build services 
Bug: 288868053
Test: verified services not built in build.trace.gz
Ignore-AOSP-First: change in topic with internal-first projects
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:23c36d95196b7a5ebca2ee7c81a1ee169a912667)
Merged-In: I9ab58d551a7446e328412af27a94d760d6f0cb67
Change-Id: I9ab58d551a7446e328412af27a94d760d6f0cb67
 2023-10-24 15:46:14 +00:00
Jared Duke
80e3995c61 Remove viewcompiler binary inclusion 
Compiled views did not ship and is being removed. Remove the associated
binary reference from default inclusion.

Bug: 158121974
Test: m
Change-Id: I5e64259d258b15ee999522a7b62becc1cd3a6ed1
Ignore-AOSP-First: In topic with internal-first projects
 2023-10-23 22:46:06 +00:00
Edgar Arriaga García
b6ae716813 Merge "Add pintool binary to system partition" into main 2023-10-23 22:38:11 +00:00
Edgar Arriaga
3cd02ac4d2 Add pintool binary to system partition 
Ignore-AOSP-First: as pintool binary is releasing with next android version.
Bug: 297095632
Change-Id: Ia641579d16c826d118c555bf110a8af65bc5b4b0
 2023-10-23 18:54:43 +00:00
Mitch Phillips
e055ea7a80 Merge "Diable memtag_stack on fullmte builds." into main am: 2d57e36a39 am: 7520b915fe am: c05e4f1484 
Original change: https://android-review.googlesource.com/c/platform/build/+/2798572

Change-Id: I567ff48183b27f41d2653cd3a2cf9ccc7c7e105e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 11:22:32 +00:00
Mitch Phillips
7520b915fe Merge "Diable memtag_stack on fullmte builds." into main am: 2d57e36a39 
Original change: https://android-review.googlesource.com/c/platform/build/+/2798572

Change-Id: I6d539343ae6a96020efb7b1bbde3195a680bfab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 10:38:44 +00:00
Mitch Phillips
1f1bff9701 Diable memtag_stack on fullmte builds. 
memtag_stack currently has a miscompile on main that prevents boot. Diable memtag_stack on fullmte builds until a new toolchain gets rolled that has the fixes.

Bug: 292478827
Bug: 301328082
Change-Id: I59af848b556088d71971dd1b6d7cc02ef61641b6
Test: Build and boot fullmte off main.
 2023-10-20 16:58:01 +00:00
Xin Li
d74507e2c1 Merge "Merge 10952656" into aosp-main-future 2023-10-19 17:59:03 +00:00
Treehugger Robot
d1aa0735ee Merge "[CrashRecovery] Add module to BCP and SSCP" into main 2023-10-18 17:01:24 +00:00
Harshit Mahajan
99e1e71e47 [CrashRecovery] Add module to BCP and SSCP 
Adding framework-crashrecovery to Bootclasspath and
service-crashrecovery to System Server Classpath.

Bug: b/289203818
Test: NA

Merged-In: I488730c04ba361955344f2c41a265836923307a6
Change-Id: I488730c04ba361955344f2c41a265836923307a6
 2023-10-18 11:26:47 +00:00
Treehugger Robot
e59839ae0e Merge "Install llndk.libraries.txt with llndk_in_system" into main am: bd7e1b13d2 am: 3df2b4a04f am: 32a31c5fa8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2792453

Change-Id: I567ef7b3aa54bbb58ec4a8539e26409d4b1821b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 04:42:35 +00:00
Treehugger Robot
32a31c5fa8 Merge "Install llndk.libraries.txt with llndk_in_system" into main am: bd7e1b13d2 am: 3df2b4a04f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2792453

Change-Id: Ie2119d30bd52564f3795a8ac6b4bdc16aeb3995b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 03:53:53 +00:00
Treehugger Robot
bd7e1b13d2 Merge "Install llndk.libraries.txt with llndk_in_system" into main 2023-10-18 02:48:10 +00:00
Ahmad Khalil
8b32a375f6 Merge "Modifying base_system to use the new SoundPicker flag" into main am: cde60cac49 am: 88056fa1f1 am: 666c543d8f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769209

Change-Id: I6cdf7f2c5d34427db3ad009400ef077d8a07c515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 22:30:07 +00:00
Treehugger Robot
569be13b3d Merge "Put the emulator_x86_arm board back" into main am: f8a21bb924 am: 46e900994a am: c5623af93b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794712

Change-Id: I9aafc777e2f1a4239115992f9221a2d1a29d76f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 22:28:56 +00:00
Ahmad Khalil
666c543d8f Merge "Modifying base_system to use the new SoundPicker flag" into main am: cde60cac49 am: 88056fa1f1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769209

Change-Id: I2aab961a62c2e6eae16de11bb2d989537feec76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 21:38:10 +00:00
Treehugger Robot
c5623af93b Merge "Put the emulator_x86_arm board back" into main am: f8a21bb924 am: 46e900994a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794712

Change-Id: Icd72cfcda4b1009ae213260f275ca09514c0d018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 21:36:49 +00:00
Ahmad Khalil
cde60cac49 Merge "Modifying base_system to use the new SoundPicker flag" into main 2023-10-17 21:22:38 +00:00
Roman Kiryanov
4a3c2b3a5c Put the emulator_x86_arm board back 
ATV still needs it. ATV will make a local copy
of this board (as the only user) and after that
this change should be reverted.

Bug: 305610937
Test: presubmit
Change-Id: I873a49d0c61b2e9711a33d0ac407d4341601af61
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-10-17 12:34:48 -07:00
Xin Li
688de9e5f5 Merge 10952656 
Merged-In: I9d5b022abee730aa5f07a8cfa87bcae59572d653
Change-Id: I04447977fa3a0f621f3e9ea9b36e6b84c8646787
 2023-10-17 10:21:05 -07:00
Kiyoung Kim
da4115d959 Install llndk.libraries.txt with llndk_in_system 
llndk.libraries.txt was installed from generic_system.mk when VNDK is
deprecated. However, as variable KEEP_VNDK is not valid from
generic_system.mk, it did not work as expected. Anyway, now
llndk.libraries.txt is required for product VNDK deprecation, and also
it would be better to be added as a required module with LLNDK libraries
over llndk_in_system module. This change relocates defining
llndk.libraries.txt as required module into llndk_in_system module.

Bug: 290160925
Test: aosp_cf build succeeded with llndk.libraries.txt installed under
/system/etc

Change-Id: I482f94d701e5dc2b4f01308a65824b38ba5b9fde
 2023-10-17 16:01:06 +09:00
Treehugger Robot
5c512428a2 Merge "Remove obsolete targets from AndroidProducts.mk" into main am: 921c545981 am: 7e7c735b4a am: 2e462a698d am: d4e4e277be am: c001f1bee6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2789632

Change-Id: Iff03afe66bd55f7a62033f17e594121565680bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 23:26:06 +00:00
Treehugger Robot
c001f1bee6 Merge "Remove obsolete targets from AndroidProducts.mk" into main am: 921c545981 am: 7e7c735b4a am: 2e462a698d am: d4e4e277be 
Original change: https://android-review.googlesource.com/c/platform/build/+/2789632

Change-Id: I66c6a4557744a880078ff66bc90f29d36607fe98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 22:37:23 +00:00
Roshan Pius
23fbc237c2 Merge "handheld_system: Replace NFC app with NFC apex" into main am: 948aae4d87 am: 03a0187b90 am: 9be63f84ce am: 2de1e08447 
Original change: https://android-review.googlesource.com/c/platform/build/+/2779728

Change-Id: Id0f40c55adf86b12d5647357415231090d56fecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 20:49:14 +00:00
Treehugger Robot
921c545981 Merge "Remove obsolete targets from AndroidProducts.mk" into main 2023-10-16 20:25:38 +00:00
Roman Kiryanov
bb479adf3a Remove obsolete targets from AndroidProducts.mk 
the target files were already deleted.

Bug: 295259752
Test: presubmit
Change-Id: I9336a4e182d5c49d7b3eb9795b874bd8b82a0a27
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-10-16 11:46:56 -07:00
Roshan Pius
948aae4d87 Merge "handheld_system: Replace NFC app with NFC apex" into main 2023-10-16 18:31:02 +00:00
Treehugger Robot
eb330df6ad Merge "Retire obsolete (32bit-only) emulator targets and boards" into main am: bfe2cc1ed1 am: 50aec24fed am: 090013f373 am: 306362c655 am: 1eadfca43d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2784390

Change-Id: I1349b9c8d817adb58351cdc899e756000bde3175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 20:35:11 +00:00
Treehugger Robot
1eadfca43d Merge "Retire obsolete (32bit-only) emulator targets and boards" into main am: bfe2cc1ed1 am: 50aec24fed am: 090013f373 am: 306362c655 
Original change: https://android-review.googlesource.com/c/platform/build/+/2784390

Change-Id: Ib0b2636f72cc557d8eeb13eea9cc9fa79a980edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 20:03:44 +00:00
Roshan Pius
d3c85ba4f5 handheld_system: Replace NFC app with NFC apex 
Bug: 303286040
Test: Compiles
Merged-In: Id451b2de566bfba73d89b95b33a99cefbdb4ea6f
Change-Id: Id451b2de566bfba73d89b95b33a99cefbdb4ea6f
 2023-10-13 18:04:31 +00:00