Commit Graph

8735 Commits

Author SHA1 Message Date
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
Mårten Kongstad
286ea9f8a8 Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: I477c1da7dd79b0156819b748d1b2ac3a39dfe84b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 14:22:07 +00:00
Mårten Kongstad
dd1ebe9300 Merge changes from topic "printflags-include-device-config" into main
* changes:
  printflags: add printflags to PRODUCT_PACKAGES
  printflags: include device_config values
2023-09-27 13:04:40 +00:00
Mårten Kongstad
583a52478b printflags: add printflags to PRODUCT_PACKAGES
Include the printflags device tool in the system image by default.

Bug: 301547297
Test: adb shell printflags
Change-Id: I3b2d71c89742bd389f6cafff8d8ab25fb81c7b00
2023-09-27 10:42:04 +02:00
Jihoon Kang
452241468c Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249

Change-Id: I1ca8eeb8b673300129ac45cba722f8d97cbfcf17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 18:20:33 +00:00
Jihoon Kang
596d514744 Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main 2023-09-26 17:49:25 +00:00
Treehugger Robot
38112357ab Merge "emulator_arm64: Revert TARGET_NO_KERNEL to emulator default" into main am: 50b8e4fb0d
Original change: https://android-review.googlesource.com/c/platform/build/+/2759532

Change-Id: I291da664bbca6a0e6661a2befbf0dc90e24592c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 23:32:03 +00:00
Treehugger Robot
50b8e4fb0d Merge "emulator_arm64: Revert TARGET_NO_KERNEL to emulator default" into main 2023-09-22 23:07:26 +00:00
Mark White
ca047da45c Added new framework-pdf jar inside MediaProvider module
Bug: 301574837
Test: presubmit and m framework-pdf
Change-Id: Id9f5ae58d57c77fdaf4babee58430e75656e923f
2023-09-22 13:33:05 +00:00
Kiyoung Kim
4345d8fd20 Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: Id0236f9d3f936532f9cf6d71f2630b85cd0450e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 02:49:35 +00:00
Kiyoung Kim
a8c405f264 Merge "Define llndk modules instead of vndk_package" into main 2023-09-22 02:15:35 +00:00
Tomislav Novak
1af7e1fa7f emulator_arm64: Revert TARGET_NO_KERNEL to emulator default
With TARGET_NO_KERNEL set to false, sdk_phone_arm64 build depends on
$PRODUCT_OUT/kernel, which no longer exists as of aosp/2548555 ("Cleanup
in emulator_arm64/device.mk").

$ lunch sdk_phone_arm64-eng && m
[...]
FAILED: ninja: 'out/target/product/emulator_arm64/kernel', needed by
  'out/target/product/emulator_arm64/boot.img', missing and no known
  rule to make it

Goldfish makefiles copy prebuilt kernels to $OUT/kernel-ranchu that
the emulator then uses, so no need to generate the boot image.

Test: lunch sdk_phone_arm64-eng && m
Change-Id: I3598ac04b352fc07679315ced4f7b7a536ccb5a5
2023-09-21 14:49:56 -07:00
Kiyoung Kim
81923d1289 Define llndk modules instead of vndk_package
vndk_package installs more than VNDK APEX, which includes LLNDK for
system and some core modules with vendor variant. This change adds a new
target llndk_in_system to instal LLNDK modules in the system image and
use this package if VNDK is deprecated

Bug: 299197187
Test: Cuttlefish and Cheetah boot succeeded without error
Change-Id: I9fe1114fdcb65c6143b5f734425c878a29138d0b
2023-09-21 15:43:55 +09:00
Kiyoung Kim
b51cfc63a5 Merge "Move vendor module into base_vendor" into main am: c6d30d3b9b
Original change: https://android-review.googlesource.com/c/platform/build/+/2758605

Change-Id: I8b90699fe82c582e94c2533eb0438d2b9e4f990a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 06:07:10 +00:00
Kiyoung Kim
c6d30d3b9b Merge "Move vendor module into base_vendor" into main 2023-09-21 05:03:58 +00:00
Kiyoung Kim
5959c0200d Move vendor module into base_vendor
There is a vendor module android.hidl.memory@1.0-impl.vendor which is
defined in the base_system. Based on the definition of base_system.mk
and base_vendor.mk, this module is better to be located in the
base_vendor.mk. This change moves the module from base_system into
base_vendor.

Bug: 301344301
Test: Cuttlefish build succeeded
Change-Id: I6dba5ec2380028b1b2c629f901db996c518e3f72
2023-09-21 10:32:50 +09:00