Commit Graph

8750 Commits

Author SHA1 Message Date
Treehugger Robot
a463723f16 Merge "Revert "[CrashRecovery] Add module to BCP and SSCP"" into main 2023-11-15 11:43:29 +00:00
Harshit Mahajan
1b22a8e7dd Revert "[CrashRecovery] Add module to BCP and SSCP"
Revert submission 2789412-cherrypicker-L65800000963076834:N61100001405784943

Reason for revert: Leading to merge conflict
Bug: b/311082270

Reverted changes: /q/submissionid:2789412-cherrypicker-L65800000963076834:N61100001405784943

Change-Id: I2cbe26499ad5ce938db7cdd3ebaf9c2e48982de9
Merged-In: I39dfab62897d907023720b594d6929397403d314
2023-11-15 08:26:47 +00:00
Alyssa Ketpreechasawat
c7bc53999d Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main 2023-11-14 19:13:32 +00:00
Devin Moore
731d920878 Merge changes from topic "revert-2818339-remove_hidl_memory-VHKFNXVYFO" into main
* changes:
  Revert "Remove android.hidl.memory library from the VNDK"
  Revert "Stop including android.hidl.memory ashmem impl on V+ devices"
2023-11-13 21:30:03 +00:00
Devin Moore
0b69afa338 Revert "Remove android.hidl.memory library from the VNDK"
Revert submission 2818339-remove_hidl_memory

Reason for revert: b/310680652 broke VTS tests

Reverted changes: /q/submissionid:2818339-remove_hidl_memory

Change-Id: Ie55fd1d0b8429a17966755ec1c54b2868ca966f9
2023-11-13 19:32:46 +00:00
Devin Moore
77393ba39d Revert "Stop including android.hidl.memory ashmem impl on V+ devices"
Revert submission 2818339-remove_hidl_memory

Reason for revert: b/310680652 broke VTS tests

Reverted changes: /q/submissionid:2818339-remove_hidl_memory

Change-Id: I1065d67949c4270d5351a9ca00ec79ead845020d
2023-11-13 19:32:54 +00:00
Devin Moore
001ed67bba Merge changes from topic "remove_hidl_memory" into main
* changes:
  Stop including android.hidl.memory ashmem impl on V+ devices
  Remove android.hidl.memory library from the VNDK
2023-11-13 17:55:30 +00:00
Alyssa Ketpreechasawat
ba231d2084 Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled.
framework-pdf is newly added framework jar which is not yet included in
the actual prebuilt apex. Thus, we add it PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY. The APEX_BOOT_JARS_EXCLUDED will be created based on PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY and will be removed from ApexBootJars.

Bug: 304719212
Test: lunch cf_x86_phone-next-userdebug & m
Test: lunch cf_x86_phone-trunk-userdebug & m
Change-Id: I9902131629900fbd629b8560a422ed8c2b06073c
2023-11-13 13:22:32 +00:00
Treehugger Robot
fc9ebd2684 Merge changes from topic "disable-dexpreopt-dexopt" into main
* changes:
  Add a Make variable to disable all dexpreopt and dexopt activities.
  Update dexopt system properties.
2023-11-10 18:47:19 +00:00
Hung-ying Tyan
d116600dc1 Don't build VNDK on GSI
Bug: 308878144
Test: manual mix on T Pixel 6

Change-Id: I924d9a52f542450bdfc727d65e668e56bb89bc50
2023-11-10 08:01:59 +00:00
Hung-ying Tyan
04531b5c79 GSI: add VNDK 34/remove VNDK 29
Bug: 291204040
Test: boot GSI on U Pixel
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4639705bdf86c8b8c1607719eab4f5791e236fe)
Merged-In: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
Change-Id: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
2023-11-10 08:00:56 +00:00
Jiakai Zhang
bf0c0e6856 Add a Make variable to disable all dexpreopt and dexopt activities.
This change adds a Make variable "OVERRIDE_DISABLE_DEXOPT_ALL", which
disables all dexpreopt and dexopt activities.

This is for faster iteration during development and should never be
enabled for production.

Bug: 309011617
Test: See no dex2oat invocation during build.
Test: Boot and see no dex2oat invocation during boot, except for the
  in-memory boot image for JIT Zygote.
Change-Id: I0193b57fdb18e1fb717f44af81d1cf525f1609ee
2023-11-09 16:50:18 +00:00
Jiakai Zhang
7707456104 Update dexopt system properties.
"extract" is now an alias of "verify".

Bug: 309011617
Test: Presubmit
Change-Id: I2bbe1874e2ea3725f3ec46ec6b50287e86cb1cca
2023-11-09 14:04:43 +00:00
Devin Moore
3ae48f2e66 Stop including android.hidl.memory ashmem impl on V+ devices
We no longer support HIDL in devices targeting Android V+ vendor.

Test: m && launch_cvd && adb shell ls /vendor/lib64/hw
Bug: 205764958
Change-Id: I6c528be1ae2bf34c790ab2efc83ce7a8db8c9770
2023-11-07 02:13:03 +00:00
Devin Moore
4859a6a250 Remove android.hidl.memory library from the VNDK
This is no longer going to be used in Android V+ device so remove it
from the VNDK.

Test: m
Bug: 205764958
Change-Id: I4f1fb8400a241961e577fbc2afb2730299a884c6
2023-11-06 23:35:48 +00:00
Roshan Pius
81d167424a Revert "handheld_system: Replace NFC app with NFC apex"
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:51dc3e7a205652c99c6d022f6fabb8b31b11d29b)
Merged-In: Ic35189ae47f3e2b4302d09cbb524f7c8e6ddc2d6
Change-Id: Ic35189ae47f3e2b4302d09cbb524f7c8e6ddc2d6
2023-11-06 19:37:43 +00:00
Handa Wang
8f1f35461e Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main 2023-11-06 08:18:55 +00:00
Roman Kiryanov
e662209bee Retire emulator build files from build/make
they were moved to device/generic/goldfish

Bug: 295259752
Test: presubmit
Change-Id: I996811e8703b43313fca3ac819e6ed333d37866b
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-11-03 10:07:03 -07:00
Handa Wang
cf72ecf193 add ot-cli-ftd in /system/bin/ for eng and userdebug builds
`ot-cli-ftd` is a CLI tool simulating a node in Thread network. See https://www.threadgroup.org/ about Thread networking technology.

It's currently in `/vendor/bin/` but we're moving it to `/system/bin/` because `ot-cli-ftd` will be used in various CI tests.

`ot-cli-ftd` is also useful for debugging purpose.

Bug: 309051262
Test: Verified on Cuttlefish.

Change-Id: I96bf2bd7575540dc86e969a80cd9bb5634c3a1ea
2023-11-03 06:49:51 +00:00
Peiyong Lin
71af449630 Make ANGLE part of Android OS system image.
As ANGLE will become the default GLES drivers and by shipped by Google,
this patch allows ANGLE to be built into Android OS image.

Bug: b/293503000
Test: atest CtsAngleDeveloperOptionHostTest -c with ANGLE being default
Test: atest CtsAngleDeveloperOptionHostTest -c with native being default
Change-Id: I72aa4e126916419d2350a4ce980bd33cb4537c73
2023-11-01 18:20:33 +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
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
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
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
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
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
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
bd7e1b13d2 Merge "Install llndk.libraries.txt with llndk_in_system" into main 2023-10-18 02:48:10 +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
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
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
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
Roman Kiryanov
e04167e58b Retire obsolete (32bit-only) emulator targets and boards
Please use 64bit-only targets instead:
* sdk_phone64_x86_64
* sdk_phone64_arm64
* we don't support x86+arm for AOSP targets

Bug: 295259752
Test: presubmit
Change-Id: I887e21ad00e6981a162da5cf1cc47827d068eee7
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-10-12 10:57:50 -07:00
Anton Hansson
dde748a831 Configure bootclasspath for sdk product
The SDK product is currently used to build the SDK sources, which
are the full sources of the bootclasspath. For this to work, the
bootclasspath needs to be configured correctly, so inherit that config.

In the future, it would probably make sense for the sources to be built
together with a device -- the emulator, at which point this config can
be removed.

Bug: 151360309
Test: lunch sdk; m sdk sdk_repo dist
Change-Id: I66b09cd42249c4d5b76f06478781a90108e006e4
2023-10-09 14:41:45 +00:00
Anton Hansson
228de7b72c Remove sdk_<arch> products
The SDK is arch-agnostic, so does not need per-arch products.

Bug: 205008975
Test: presubmit
Change-Id: I1847ab2bae0d07793bdd043430f0e79b36edb384
2023-10-09 14:41:30 +00:00
Alyssa Ketpreechasawat
b89b3f6108 Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main 2023-10-06 10:56:29 +00:00
Alyssa Ketpreechasawat
0a86673d46 Revert "Added new framework-pdf jar inside MediaProvider module"
Revert submission 2759049-framework-pdf

Reason for revert: it blocks us from enabling prebuilts in next target in main (go/stale-mainline-prebuilts for more info)

Reverted changes: /q/submissionid:2759049-framework-pdf

Change-Id: I7765daebf6a85f0c8d737c0cf163b1fdbe29f969
2023-10-05 16:09:51 +00:00
Treehugger Robot
cbceed2231 Merge "Install VNDK v35 in the vendor partition" into main am: f4e7e17dc4
Original change: https://android-review.googlesource.com/c/platform/build/+/2774164

Change-Id: I8949364d94b6263f06522992f6790c22a8ec6a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 13:00:33 +00:00
Justin Yun
4a39d20909 Install VNDK v35 in the vendor partition
This is required for the vendor image with VNDK v35 to be used for
the GRF configuration.
This does not modify the VNDK install path before release.

Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: I689cb6dcf66cd4a23c447bd0d761677f78b0936a
2023-10-05 18:07:20 +09:00
Ahmad Khalil
576421d844 Modifying base_system to use the new SoundPicker flag
Bug: 293846645
Change-Id: I4b9e0b3cd80f43f9e766d430d749238d10a9eb82
Test: N/A
2023-10-03 15:37:16 +00:00
Treehugger Robot
b93e3b021e Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I306f5cc077588f0036726a3c5da9ce5acaeffacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 03:44:40 +00:00
Cole Faust
36e089a6cc Convert gsi_skip_mount.cfg to soong
The LOCAL_POST_INSTALL_CMD is problematic for m installclean-less
builds.

Bug: 205632228
Test: presubmits
Change-Id: Id4eb2fd5fbd4f080aec89fa90583ac2ec97c5e1c
2023-10-02 17:28:59 -07:00
Mark White
23e70c67ad Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: I6c7e02dbe20d457e5f63a2304665bca400879f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 13:26:48 +00:00
Mark White
d577d60221 Merge "Added new framework-pdf jar inside MediaProvider module" into main 2023-09-29 12:21:33 +00:00