Commit Graph

9079 Commits

Author SHA1 Message Date
Roshan Pius
2c7ad317f1 Merge "handheld_system: Replace NFC app with NFC apex" into main 2023-10-13 14:12:09 +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
292cfe1a0c Merge changes I66b09cd4,I1847ab2b into main am: a43c06e5d6 am: dd11d060d7 am: 44011c169a am: 8e66440ca5 am: 446525a3d8
Original change: https://android-review.googlesource.com/c/platform/build/+/2778930

Change-Id: Icc233821d17dd3584c162fbfa0ca457c9637d74c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 03:24:08 +00:00
Anton Hansson
446525a3d8 Merge changes I66b09cd4,I1847ab2b into main am: a43c06e5d6 am: dd11d060d7 am: 44011c169a am: 8e66440ca5
Original change: https://android-review.googlesource.com/c/platform/build/+/2778930

Change-Id: I2b42cbe0e3a3bb97d9e92a38eac1acee2f976e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 02:16:27 +00:00
Roshan Pius
3e88b3a8fc handheld_system: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
(cherry picked from https://android-review.googlesource.com/q/commit:4719a59f2798eb72f1b9f2b8a3d1753f1ee5dd98)
Merged-In: Id451b2de566bfba73d89b95b33a99cefbdb4ea6f
Change-Id: Id451b2de566bfba73d89b95b33a99cefbdb4ea6f
2023-10-09 20:32:08 +00: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
Sergiu Ferentz
6d03ef8a3d Merge "Bump android.hardware.graphics.common V4->V5" into main 2023-10-09 08:27:27 +00:00
Alyssa Ketpreechasawat
a3a597890e Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: b89b3f6108 am: f67da95b8c am: 7c247aa7a4 am: 01126a5b38 am: ca064c455a
Original change: https://android-review.googlesource.com/c/platform/build/+/2775631

Change-Id: I125bfc66070889ef894b83bed865ca1993fc48e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:47:33 +00:00
Alyssa Ketpreechasawat
ca064c455a Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: b89b3f6108 am: f67da95b8c am: 7c247aa7a4 am: 01126a5b38
Original change: https://android-review.googlesource.com/c/platform/build/+/2775631

Change-Id: I69a8f36303e84351090ebd62dd061ad478f0011c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 13:53:24 +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
Ján Sebechlebský
3bd7e33475 Merge "Add Virtual Camera HAL service to base_system." into main 2023-10-05 16:13:59 +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
4ea9ca651f Merge "Install VNDK v35 in the vendor partition" into main am: f4e7e17dc4 am: cbceed2231 am: dc67ccf62e am: a2874ee1e6 am: bdd2e4a34f
Original change: https://android-review.googlesource.com/c/platform/build/+/2774164

Change-Id: I925a9f9549460e7254664662b5f9d2d161181716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 15:50:17 +00:00
Treehugger Robot
bdd2e4a34f Merge "Install VNDK v35 in the vendor partition" into main am: f4e7e17dc4 am: cbceed2231 am: dc67ccf62e am: a2874ee1e6
Original change: https://android-review.googlesource.com/c/platform/build/+/2774164

Change-Id: I6270cf530d39620523f8a8bb6327591c2bce4116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 14:50:48 +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
Jan Sebechlebsky
47cd7202ec Add Virtual Camera HAL service to base_system.
... following instructions to add new binary using build flags.

Bug: 301023410
Test: mm
Ignore-AOSP-First: Virtual Camera HAL target is not merged in AOSP.
Change-Id: I83b6a33775c763671eb2ab11e5fca9b12676b1bc
2023-10-05 09:17:12 +02:00
sergiuferentz
e62001953f Bump android.hardware.graphics.common V4->V5
Test: Build
Ignore-AOSP-First: changes in topics with internal-first/internal-only projects
Bug: 291142745
Change-Id: Iefb2ebc22f622d8e97f8a878f972d8b354aa1b7d
2023-10-04 13:21:28 +00: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
a0db5763a1 Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073 am: b93e3b021e am: 11b0e7a152 am: 3292fc24df am: e3c42a48ee
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I0ec15b206fbe1417ba4968e30ee0342c7cb70b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:53:57 +00:00
Treehugger Robot
e3c42a48ee Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073 am: b93e3b021e am: 11b0e7a152 am: 3292fc24df
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I6ed60bf4467d02851efcd48e09c8dc5dcd062ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:24:08 +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
Victor Hsieh
e8a9b9b943 Add preinstalled-packages-strict-signature.xml to build
Please refer to the topic change for context.

Ignore-AOSP-First: new file added in the internal branch
Bug: 277344944
Test: m
Change-Id: I09dd6b152c3a4b4e884132885d72f97e805797f8
2023-09-29 11:26:57 -07:00
Mark White
48153e18ce Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221 am: 23e70c67ad am: 032c4c62b8 am: 3f3f035f16 am: 0ced72aa62
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: I9f1f58bbebfd22aec316599a0ee33732cbeef108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 17:39:37 +00:00
Mark White
0ced72aa62 Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221 am: 23e70c67ad am: 032c4c62b8 am: 3f3f035f16
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: Ic3c21b31de78ed719605a33ca048bce6e280827c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 16:23:17 +00: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
739bbde46d Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300 am: 286ea9f8a8 am: 8bc2be2b5c am: 6f3642b88f am: 50491ebbbe
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: I52aeadd143a1c9be74a86fe1afbdbb2e497b19bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:44:13 +00:00
Mårten Kongstad
50491ebbbe Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300 am: 286ea9f8a8 am: 8bc2be2b5c am: 6f3642b88f
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: I08f9cc79a4b1dc4baa3a40de1eb3409bf8cac80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:39:02 +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
94b5d81de8 Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744 am: 452241468c am: 5d2cf49036 am: 462f1cba6b am: 1ddc046b62
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249

Change-Id: I89fe0dfd688b72a9f5c9e9308285bcae9d026c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 22:31:21 +00:00
Jihoon Kang
1ddc046b62 Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744 am: 452241468c am: 5d2cf49036 am: 462f1cba6b
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249

Change-Id: Iee9fe45de38bba4dde3dd054584ff844545d8ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 21:24:10 +00: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
b6ece2d257 Merge "emulator_arm64: Revert TARGET_NO_KERNEL to emulator default" into main am: 50b8e4fb0d am: 38112357ab am: 61bf849e1d am: 7e88607173 am: 4c88a966ba
Original change: https://android-review.googlesource.com/c/platform/build/+/2759532

Change-Id: I1f35d3dbc9364eb80700870b18774f813981ca7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 03:14:41 +00:00
Treehugger Robot
4c88a966ba Merge "emulator_arm64: Revert TARGET_NO_KERNEL to emulator default" into main am: 50b8e4fb0d am: 38112357ab am: 61bf849e1d am: 7e88607173
Original change: https://android-review.googlesource.com/c/platform/build/+/2759532

Change-Id: I29ca1a47680e7019d5cb7fb9332f0b3cbe9089f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 02:06:07 +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
7d500d265d Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264 am: 4345d8fd20 am: c85717900d am: 798c03e59b am: 8908792eba
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: Ib730bcf18091d2d57b465df5eb6beabfe47cdf01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 06:26:20 +00:00
Kiyoung Kim
8908792eba Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264 am: 4345d8fd20 am: c85717900d am: 798c03e59b
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: I606465eb0605677407e6394276dbc4656e12860b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 05:20:46 +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
7cd53a62f3 Merge "Move vendor module into base_vendor" into main am: c6d30d3b9b am: b51cfc63a5 am: 5d57118010 am: bb1df6b155 am: 347265e876
Original change: https://android-review.googlesource.com/c/platform/build/+/2758605

Change-Id: I066a3873fcd9333067d9fa6437ade9b179f1a509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 09:44:08 +00:00
Kiyoung Kim
347265e876 Merge "Move vendor module into base_vendor" into main am: c6d30d3b9b am: b51cfc63a5 am: 5d57118010 am: bb1df6b155
Original change: https://android-review.googlesource.com/c/platform/build/+/2758605

Change-Id: I8f5cc5f15bf2f2eac2e07d2992e4d104457ebf06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 08:40:00 +00:00