tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
96817 commits 1 branch 0 tags 119 MiB
Commit graph

9168 commits

Author SHA1 Message Date
Devin Moore
8a68859bef Reapply "Remove android.hidl.memory library from the VNDK" 
This reverts commit 0b69afa338.

Test: m
Bug: 205764958
Bug: 310700278
Bug: 310680652
Change-Id: I3cbae50922fcc230f402f68732faf50ed5683f25
 2023-11-13 22:40:43 +00:00
Devin Moore
a700ffcb1c Merge changes from topic "revert-2818339-remove_hidl_memory-VHKFNXVYFO" into main am: 731d920878 
Original change: https://android-review.googlesource.com/c/platform/build/+/2828479

Change-Id: I08444cce4388ab0f9b59fd23d576fb61bfe811f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 21:56:40 +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
7ad38f0db9 Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba am: 7622538d1c am: 9cb1b74911 
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339

Change-Id: I63b9166202d7a045bba573c0fe1540ec4b725ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 20:15:42 +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
7622538d1c Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339

Change-Id: Id79bd6d0bdba7006fee6f1b261155f264c13d812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 19:02:56 +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
66d40dbecf Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684 am: 84d00a4ff6 am: 6bb3bee4ba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: I62bddbdf9f3ae0b075824b3db7acb69e7f325d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 21:13:00 +00:00
Treehugger Robot
84d00a4ff6 Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684 
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: I3d4007a6aea280118df9cb0073478a497d01590e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 19:18:23 +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
Treehugger Robot
cdbf7a19ae Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec am: 0049761888 am: fa2e92ad5f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192

Change-Id: Ib2e7572d27f5c3227d039e50980b867e554bc47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 10:28:25 +00:00
Treehugger Robot
0049761888 Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec 
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192

Change-Id: Ibd220ff1a38643d437a363c3a930c02eade12f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 09:08:59 +00:00
Treehugger Robot
0a7b4ebd66 Merge "GSI: add VNDK 34/remove VNDK 29" into main am: 4e7ba9e30c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2826010

Change-Id: Ic4d8d9a155f34b5b8c05c61b60e9b74e05646fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-10 09:08:45 +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
Roshan Pius
0af51caae3 Merge "Revert "handheld_system: Replace NFC app with NFC apex"" into main am: 7705138aed 
Original change: https://android-review.googlesource.com/c/platform/build/+/2817948

Change-Id: If180df2e70a026d1ac25bc7577611518eff62dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 21:45:25 +00:00
Alyssa Ketpreechasawat
7b64118d72 Revert "Revert "Added new framework-pdf jar inside MediaProvider..." 
Revert submission 2775627-revert-2759049-framework-pdf-UAOVGTHHXO

Reason for revert: submit together with the fix to allow this new jar to coexist w/ mainline prebuilts

Reverted changes: /q/submissionid:2775627-revert-2759049-framework-pdf-UAOVGTHHXO

Change-Id: I191f33fa932173140ab8fd4062514c7e082aec5e
 2023-11-08 16:04:05 +00:00
Devin Moore
9369f8df9a Add all of the packages used to support older/upgrading devices 
There are packages included in system based on the shipping api level of
the device. All of those packages should be added to GSI to
support all of the devices with supported shipping API levels

Test: lunch aosp_x86_64 && m
Bug: 298506436
Bug: 205764958
Change-Id: I5a374ce92bab457e7171b9623a7af3ee0847ae8a
 2023-11-07 19:33:33 +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
Roshan Pius
b9cc807aff Merge "Revert "handheld_system: Replace NFC app with NFC apex"" into main 2023-11-06 14:31:03 +00:00
Handa Wang
3443732586 Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main am: 8f1f35461e am: 0f5b04f64f am: ad96d3dd09 
Original change: https://android-review.googlesource.com/c/platform/build/+/2817055

Change-Id: Iac4d92160f777d491934b86999d021ec8e5cf66d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 09:44:48 +00:00
Handa Wang
69a637ed9b Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main am: 8f1f35461e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2817055

Change-Id: If3465c220ed3ffd4c64953671e8d1d4a9d946860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 09:07:35 +00:00
Handa Wang
ad96d3dd09 Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main am: 8f1f35461e am: 0f5b04f64f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2817055

Change-Id: Ia6beccda745813e21b38fb96e2d9d7bf9cad4a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 09:03:41 +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
Roshan Pius
51dc3e7a20 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
Change-Id: Ic35189ae47f3e2b4302d09cbb524f7c8e6ddc2d6
Test: Compiles, device boots up
 2023-11-04 14:58:44 +00:00
Treehugger Robot
fa6e2adfa7 Merge "Retire emulator build files from build/make" into main am: e3dca814e3 am: 14a06f4c68 am: 60799bfa35 
Original change: https://android-review.googlesource.com/c/platform/build/+/2816877

Change-Id: I22b0f4f84bd338160340ce3293b6b0471503446d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 19:59:46 +00:00
Treehugger Robot
14a06f4c68 Merge "Retire emulator build files from build/make" into main am: e3dca814e3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2816877

Change-Id: I491a39931966538d5675f4eb2adffb89d0d5411c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-03 18:48:11 +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
af41bcb4ed Merge "Make ANGLE part of Android OS system image." into main am: 492220c695 am: 0750e0bd17 am: 42d4ba096f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2693296

Change-Id: I6820f9baed79d7ce095f96295276f15970a69c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 18:21:09 +00:00
Peiyong Lin
11edb41b75 Merge "Make ANGLE part of Android OS system image." into main am: 492220c695 
Original change: https://android-review.googlesource.com/c/platform/build/+/2693296

Change-Id: Ic3217d68f7aa51ff40895a2fccaeb3625390c45e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 17:45:51 +00:00
Peiyong Lin
42d4ba096f Merge "Make ANGLE part of Android OS system image." into main am: 492220c695 am: 0750e0bd17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2693296

Change-Id: I8151e58b47c18e414787512d5487457987cb8251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-02 17:41:59 +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
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
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
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
Jihoon Kang
e06e4c5037 Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets 
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API added to the sdk targets will be used to determine whether to exclude flagged apis for next release or not.

Test: m TARGET_PRODUCT=sdk nothing
Bug: 299570421
Change-Id: I00cb84341a05e296a0c747d4921ed5fe445eabe6
 2023-09-20 19:53:04 +00:00
Treehugger Robot
21ea477a99 Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708 am: 948d449316 am: 76da65c598 am: 07517f9e70 am: 222fc3701a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: I01f4b651f0255135d0d7fbca89468d65ff36ce3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 10:33:02 +00:00
Treehugger Robot
222fc3701a Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708 am: 948d449316 am: 76da65c598 am: 07517f9e70 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: I2fe77abebfc365fcfd847495fef3576e4824a284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 09:28:02 +00:00
Treehugger Robot
9e40d6bf5f Merge "Restore the VNDK list for v34 which was frozen" into udc-dev-plus-aosp am: d7ab5d122b am: 0fe3772136 am: a5a1d2afb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24798346

Change-Id: I68227ae92a93de6eaeb390d89b05ced1086c701a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 07:54:26 +00:00
Treehugger Robot
a5a1d2afb4 Merge "Restore the VNDK list for v34 which was frozen" into udc-dev-plus-aosp am: d7ab5d122b am: 0fe3772136 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24798346

Change-Id: Ida61c3b1eba3ab16031f2649c15ab7a4ea83193a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 07:41:53 +00:00
Treehugger Robot
948d449316 Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: Ibe1dda6123ec55240fbf8dc525a6a1ca89f528cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 06:56:43 +00:00
Justin Yun
d34a22ce39 Restore the VNDK list for v34 which was frozen 
VNDK v34 was already frozen and must not be changed. Restore the
original version of the VNDK list.

Ignore-AOSP-First: This is not released in AOSP yet
Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: I0edb24568f28caf8b08cfa5c1b6dba44d3c91a9e
 2023-09-20 04:48:53 +00:00
LaMont Jones
e61610d31a Add support for TARGET_BOARD_INFO_FILES 
This makes it so that portions of android-info.txt can come from
different sources.

Bug: b/301141632
Test: manual
Change-Id: I82793b37162f52805db425b802a2e0762526bd91
 2023-09-19 23:06:39 +00:00
Jooyung Han
9a561e793f Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f am: a60ddcab86 am: 7d06ca9d8d am: 1a9f024da7 am: fe02b7ce20 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: I76169f3f3e668a67c940ef2df83b02bf451f2929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 04:31:43 +00:00
Jooyung Han
fe02b7ce20 Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f am: a60ddcab86 am: 7d06ca9d8d am: 1a9f024da7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: I0252b9a7b2e8d7658da0228f5280e53bafaa4922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 03:27:52 +00:00
Jooyung Han
7d06ca9d8d Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f am: a60ddcab86 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: I9e300e2b69b22a343a530ef66274db21ebe41f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 01:57:03 +00:00
Jooyung Han
a60ddcab86 Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: Ib2e535c0a3991f4d58c3a0480ee3373eaa62894d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 01:50:44 +00:00
Jooyung Han
4f6eb3112f Merge "Revert^2 "Install CAS HAL APEX"" into main 2023-09-19 01:18:07 +00:00
Sebastian Pickl
a175a28fb9 Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 am: f4ce61774a am: 96d2c61fda am: a96208b8b4 am: 936d843df8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: I71b2d49d619e75c70207da12f589d9b3f831080b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 16:03:27 +00:00
Sebastian Pickl
936d843df8 Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 am: f4ce61774a am: 96d2c61fda am: a96208b8b4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: Id1fddcf22cfd71efb288b34516086d356855ee16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 15:02:07 +00:00
Sebastian Pickl
96d2c61fda Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 am: f4ce61774a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: Ib53fc2b438e8f2710ac18fae946cf2336ab8bb42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 13:32:24 +00:00
Jooyung Han
72187661c3 Revert^2 "Install CAS HAL APEX" 
5d6da97ed0

Change-Id: Ic621583ff1ee1c3eefb6caeff77d950f2e08e1e1
 2023-09-14 13:31:55 +00:00
Sebastian Pickl
f4ce61774a Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: I0d3225691bfe3fe1f471ba49ad5e0fdc21ef6d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 12:37:00 +00:00
Sebastian Pickl
91646be0a5 Merge "Revert "Install CAS HAL APEX"" into main 2023-09-14 12:26:38 +00:00
Sebastian Pickl
5d6da97ed0 Revert "Install CAS HAL APEX" 
Revert submission 2742398-cas-apex

Reason for revert: culprit for flake b/300311777, verified with go/abtd with 15 runs to make sure the flake is gone https://android-build.googleplex.com/builds/abtd/run/L46500000963034919

Bug:300311777

Change-Id: I2b566413ac1869f9bf3e974da7d84662047e436a
 2023-09-14 12:25:49 +00:00
Treehugger Robot
dd86a228eb Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 am: a61ed55d48 am: bc18f8c151 am: 8256c1b672 am: 892120d1c2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I3cefcbd4d4252422f85b6becd824839a8428e25e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 04:11:39 +00:00
Treehugger Robot
892120d1c2 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 am: a61ed55d48 am: bc18f8c151 am: 8256c1b672 
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I0aa1361dcd0142d115ce0596e4408539acd3dbce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 03:07:01 +00:00
Treehugger Robot
bc18f8c151 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 am: a61ed55d48 
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I438e0f14237eaa82794d3c47aa534b17b0164e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 01:37:03 +00:00
Treehugger Robot
a61ed55d48 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I9eec8eed73fe4f3e816765ef59cff2e612f2c679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 00:43:18 +00:00
Treehugger Robot
1e042d4635 Merge "Do not freeze VNDK in trunk stable" into main 2023-09-14 00:16:18 +00:00
Justin Yun
e9525900e5 Do not freeze VNDK in trunk stable 
VNDK will be frozen only if the VNDK version is less than or equal to
34. Otherwize do not freeze the VNDK libraries.

Bug: 297542516
Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: Icdd288f65c5f7bdb5b4899c8e96820c2a147a011
 2023-09-13 13:07:34 +09:00
Jooyung Han
66392e0bd3 Merge "Install CAS HAL APEX" into main am: be6ba681e9 am: 1565036d44 am: e053f9f34f am: b2e4a8c844 am: 15731d0704 
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: I6758cb9c5f413997c4c4d10722a3fbb125c09942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 03:52:17 +00:00
Jooyung Han
15731d0704 Merge "Install CAS HAL APEX" into main am: be6ba681e9 am: 1565036d44 am: e053f9f34f am: b2e4a8c844 
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: I87bc320565fa4c52bc5183d9218854b85a4e4c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 02:51:46 +00:00
Jooyung Han
e053f9f34f Merge "Install CAS HAL APEX" into main am: be6ba681e9 am: 1565036d44 
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: I8bba3c57662f2de619da9418e8296d615614c59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 01:24:51 +00:00
Jooyung Han
1565036d44 Merge "Install CAS HAL APEX" into main am: be6ba681e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: Id2497994e483a95339bdf6d04ea939d5981e6b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 01:20:22 +00:00
Dennis Shen
fa7f6d4a64 Merge "update sever_configurable_flags to vndk true" into main 2023-09-06 12:00:42 +00:00
Jooyung Han
62df04d78f Install CAS HAL APEX 
Bug: 297467514
Test: CtsMediaMiscTestCases#MediaCasTest
Change-Id: I4fc9496381a92c26e1b1a4aebfee947770c7ad5c
 2023-09-06 16:20:06 +09:00
Cole Faust
1b32c99148 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 am: 79b49a32ba am: 0273f3cd40 am: a4b5a72af6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: I75b8e1667708066e8078c3d4eb3727b758ca87a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 04:11:12 +00:00
Cole Faust
a4b5a72af6 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 am: 79b49a32ba am: 0273f3cd40 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: I85dff2e7a0adafc771c2614d3ceff3cc83f91ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 03:13:19 +00:00
Cole Faust
79b49a32ba Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Icb542999a02db66ea698b95158ec0f2231141013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 01:50:24 +00:00
Cole Faust
62fcb3fcf5 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Iaa7f81c3a30efd028a29070dabe74d638b0cd748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 01:00:51 +00:00
Cole Faust
56e8f7009c Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main 2023-09-06 00:15:09 +00:00
Cole Faust
c67e769b8c Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set 
LOCAL_SOONG_INSTALL_SYMLINKS can now be set by the install_symlink
module type. The install_symlink module type doesn't set
LOCAL_SOONG_INSTALLED_MODULE because make tries to copy that file
around, which doesn't work with a symlink.

Bug: 205632228
Test: built and ran the emulator observed the /system/bin/hwservicemanager symlink is still there
Change-Id: I1ec355b5ae057d0b7fe167674d70da6a4d03f6b5
 2023-09-05 14:16:38 -07:00
Dennis Shen
e74b12cd7b update sever_configurable_flags to vndk true 
Bug: 297419706
Change-Id: I46a8d9e35d28ad9eb7e305465e537dcf23e523f4
Ignore-AOSP-First: need to submit to git main first to resolve merge conflict, will used merged in in aosp change
 2023-09-05 19:41:55 +00:00
Treehugger Robot
ac1535d4a7 Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 am: cef69de0fd am: 06da7cbec1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: Ifa2ac3a1bdad492e6a98bcf2e1a4fc160df36e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 03:02:04 +00:00
Treehugger Robot
06da7cbec1 Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 am: cef69de0fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: I05ba68038ad19a0f01be3516f986b1551ab1eeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 02:00:47 +00:00
Treehugger Robot
436a85aff7 Merge "Add vndk list change history file" into udc-dev-plus-aosp 2023-09-04 00:44:29 +00:00
Treehugger Robot
1e8145dd4c Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 am: df13dc9be8 am: e9e781fea1 am: b09a85e7c8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: I68650d0e241786e258476f8a73741cca9b011547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 03:26:51 +00:00
Treehugger Robot
b09a85e7c8 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 am: df13dc9be8 am: e9e781fea1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: I0d6638a59b276b18edc3aa3da7f487a8f01d8e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 02:23:14 +00:00
Treehugger Robot
df13dc9be8 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: Id2c4cd9e5d06daae60a4988403deeede6002badc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 00:54:42 +00:00
Treehugger Robot
d56c052f72 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: Ib34308cf87d0c2c26055379ab117668fc6bf4f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 00:01:04 +00:00
Treehugger Robot
5da26c0ab3 Merge "Add the adevice host tool to standard builds" into main 2023-09-01 23:13:14 +00:00
Joe Onorato
08d6ebf118 Add the adevice host tool to standard builds 
Test: treehugger
Change-Id: Ib8caceecbcc355f6aa8725a2f134f2d1ac86d387
 2023-09-01 13:24:51 -07:00
Justin Yun
d8e310348b Add vndk list change history file 
Some devices may have the vndk files before that are removed after
the version fix. To track those devices, leave history of the list
change.

Ignore-AOSP-First: udc not yet released
Bug: 298120088
Test: atest vts_vndk_files_test
Change-Id: I0b532e706d3b7214be7d67e7b34e0ccf993759b7
 2023-09-01 09:13:01 +00:00
Devin Moore
48854f1b8d Remove hwservicemanager and hidl allocator. am: 64c2559577 am: 278aea5ba4 am: 516f2d9cb8 am: 570d5e6a98 am: 67ef54058d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: Ieacf062b55976c179157d48575ea94d77b591ad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 18:49:56 +00:00
Devin Moore
67ef54058d Remove hwservicemanager and hidl allocator. am: 64c2559577 am: 278aea5ba4 am: 516f2d9cb8 am: 570d5e6a98 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I38e41eb2aad7db9813b24308f11a3ea4cec9c09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:49:57 +00:00
Devin Moore
516f2d9cb8 Remove hwservicemanager and hidl allocator. am: 64c2559577 am: 278aea5ba4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I2a62fa5d2bc5286c5022d062f5bedf6ffdece410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 16:25:08 +00:00
Devin Moore
278aea5ba4 Remove hwservicemanager and hidl allocator. am: 64c2559577 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I250e776c31413097c7c5438db36be890bcdd0881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 16:22:41 +00:00
Devin Moore
01e56d0ae0 Merge changes from topic "no_hidl_support" into main 
* changes:
  Add symlink to hwservicemanager
  Remove hwservicemanager and hidl allocator.
 2023-08-31 15:51:14 +00:00
Treehugger Robot
0c74b18920 Merge "Update vndk list 34.txt" into udc-dev-plus-aosp am: 89f0428c87 am: 24175526f1 am: f3e72aa8df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24581788

Change-Id: I790ef71ab8c50123ae4fe87c731b17d77cae242a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 23:15:27 +00:00
Treehugger Robot
f3e72aa8df Merge "Update vndk list 34.txt" into udc-dev-plus-aosp am: 89f0428c87 am: 24175526f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24581788

Change-Id: Iabefdf31d498bd577b8610fdc4f9442d2d68044e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 04:53:57 +00:00
Justin Yun
dc6e1496fc Update vndk list 34.txt 
Bug: 297542516
Test: lunch cf_x86_64_phone-next-userdebug && m
Change-Id: I7984e0f1d311ed4a9f908f0232f2bc1994a90157
 2023-08-29 10:54:00 +09:00
Xin Li
c76319f88c Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:13:35 +00:00
Jooyung Han
fae9accba0 Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f am: ea6b3e5018 am: f23413e208 am: bf2fb0676e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I4ef7511d2a0a88d5b6a7e7451747f839ceda3efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 03:55:03 +00:00
Jooyung Han
bf2fb0676e Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f am: ea6b3e5018 am: f23413e208 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I23d643b8197c34172b84cdc646d5c2bf7510c397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 03:02:40 +00:00
Jooyung Han
ea6b3e5018 Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I12bbafad67e538b82987271f29af47c548b975f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 01:49:52 +00:00
Xin Li
be1435290d Merge Android U (ab/10368041) 
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
 2023-08-25 13:25:26 -07:00
Jooyung Han
0d500c58aa Remove TARGET_FLATTEN_APEX 
And inherit updatable_apex.mk by default.

Bug: 278826656
Test: presubmit
Change-Id: I3f93608a8750dcd72edc3f9517c70f3490f1a7cd
 2023-08-25 15:06:20 +09:00
Chris Poultney
2553e7f239 Merge "Adds modern wallpaper pickers to AOSP installs" into udc-qpr-dev-plus-aosp am: febe181b6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24538241

Change-Id: I8928276c1bfd36f053377e727ccaf6fcf9931982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 02:11:13 +00:00
Cole Faust
8a2e3c9b91 Remove vndk-29 symlinks from allowlist 
ag/24061450 removed version 29 from PRODUCT_EXTRA_VNDK_VERSIONS on
internal only, meaning these symlinks aren't generated anymore.

Ignore-AOSP-First: To match ag/24061450

Fixes: 296972684
Test: lunch gsi_tv_arm-userdebug, m nothing
Change-Id: If9dfb9cafb6cf1a65df1af5b444c9b0b9c61bfe7
 2023-08-24 12:07:37 -07:00
Chris Poultney
5541d13e89 Adds modern wallpaper pickers to AOSP installs 
Bug: b/294871815
Change-Id: I2658d2e5b4d4500f5a991c049f3ea9d2eb2db1a8
Test: built and flashed aosp device and launched ThemePicker
Test: ran all CTS tests per b/294871815#comment11 on aosp device with ThemePicker
Ignore-AOSP-First: Change only applies to udc-qpr-dev and forward and will cause breakages in tm-dev and udc-dev.
 2023-08-24 15:19:31 +00:00
Vincent Donnefort
96fd2bb80e Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 am: 3e8443e18e am: ad81fc0d1d am: f1f3c8ab80 am: 01def4629e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: I296ccf29acdb056998f3bfe49573c8d5bec31573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 11:34:08 +00:00
Vincent Donnefort
01def4629e Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 am: 3e8443e18e am: ad81fc0d1d am: f1f3c8ab80 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: Ieee0b6ea843667c9425df2557281b2e5c598c036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 10:47:48 +00:00
Vincent Donnefort
ad81fc0d1d Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 am: 3e8443e18e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: I3fa9a706433a3c93d1305977b5bb7bb9fc2cd73c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 09:37:34 +00:00
Vincent Donnefort
07c4b5c0f2 Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main 2023-08-24 08:11:04 +00:00
Woody Lin
371905638a Revert "Adds modern wallpaper pickers to AOSP installs" 
This reverts commit af76a98608.

Reason for revert: To fix regression test failure on 'WallpaperPickerGoogleTests'
Bug: 297301079

Change-Id: Id9eb21db31182c68551ef9e3c3d4d258879c541b
 2023-08-24 05:41:52 +00:00
Chris Poultney
b7df6db578 Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 am: 6107268165 am: 57a48aaa8e am: 4d7d1a22c8 am: 51611e7654 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: Ida7148aa527901ba0fa2a23bbe9e1b47bac4c24b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 05:41:33 +00:00
Chris Poultney
51611e7654 Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 am: 6107268165 am: 57a48aaa8e am: 4d7d1a22c8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: Iaf7217af984606953a8b5348962ed0e42ed004c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 04:53:02 +00:00
Chris Poultney
57a48aaa8e Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 am: 6107268165 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: Id998ce6660a492f51a1cbfe1c679cb15d424e8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 03:45:46 +00:00
Chris Poultney
214c0e27e1 Merge "Adds modern wallpaper pickers to AOSP installs" into main 2023-08-24 02:21:24 +00:00
Mark White
e3de809931 Merge "Created empty framework-location non-updatable module" into main 2023-08-23 17:25:38 +00:00
Kangping Dong
cfe8ec4c2a Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 am: 13aaf50595 am: 21989e8b72 am: 114fc180a2 am: bd7e6f5d93 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: Ib2a3d2325cde47f7211f069222f3f4c9fcc309a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 11:01:08 +00:00
Kangping Dong
a06b145287 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752 am: fcafc708a0 am: 5e0b44c76d am: 34aa3b1946 
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: Ie08fae42b1ee474d2736087b373c52e07c84cf11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 11:01:02 +00:00
Kangping Dong
bd7e6f5d93 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 am: 13aaf50595 am: 21989e8b72 am: 114fc180a2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: I77b79395860cb850e56ef6829f782c76636b4c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 10:49:33 +00:00
Kangping Dong
34aa3b1946 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752 am: fcafc708a0 am: 5e0b44c76d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: Id1387ebe609ed7d8c32610f7ce87dc26c5240c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 10:49:29 +00:00
Kangping Dong
21989e8b72 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 am: 13aaf50595 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: I061353705b5ae7b3948c73bee11ec8dd229b4712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 09:44:32 +00:00
Kangping Dong
fcafc708a0 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752 
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: I1122148b13710be4c9bd90ba253d7ddf1834b1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 09:44:27 +00:00
Kangping Dong
a169e4f7f6 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main 2023-08-23 08:37:38 +00:00
Kangping Dong
2a8b64271d Merge "Revert "add service-threadnetwork to system_server jars"" into main 2023-08-23 08:37:38 +00:00
Treehugger Robot
112b3225cf Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e am: 5403b178a8 am: 8676bb08af am: 7beaebe190 am: d312aaf9c5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I2c24ac3c6b084beb6fa0516cc98087d2c9d4bde1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 08:28:07 +00:00
Treehugger Robot
d312aaf9c5 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e am: 5403b178a8 am: 8676bb08af am: 7beaebe190 
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I2de90c1e9465f6873b06bd7464a3f161f2643b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 07:42:09 +00:00
Treehugger Robot
8676bb08af Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e am: 5403b178a8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I9b248d401a5f81e5e194fc9e8ee8903ecd80bd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 06:36:47 +00:00
Treehugger Robot
99dc0cc49e Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-23 05:24:48 +00:00
Chris Poultney
af76a98608 Adds modern wallpaper pickers to AOSP installs 
Bug: b/294871815
Change-Id: Id4c198f79a32b1b5a6a1a594cbb88f8df1623fe7
Test: built and flashed aosp device and launched ThemePicker
Test: ran all CTS tests per b/294871815#comment11 on aosp device with ThemePicker
 2023-08-23 02:53:00 +00:00
Ronald Braunstein
8698a15b7e Merge "Add adevice_fingerprint to eng builds." into main am: d7eeaba58f am: 94c845def4 am: 48ba4aced4 am: add40e14c9 am: a7184c68f2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722456

Change-Id: If1b3198fcca35069a19a9fc8c945760bc5bff57d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 02:50:04 +00:00
Ronald Braunstein
a7184c68f2 Merge "Add adevice_fingerprint to eng builds." into main am: d7eeaba58f am: 94c845def4 am: 48ba4aced4 am: add40e14c9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722456

Change-Id: Ic18d531f956e444397f68c7098a968f5ed45df9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 02:05:30 +00:00
Ronald Braunstein
48ba4aced4 Merge "Add adevice_fingerprint to eng builds." into main am: d7eeaba58f am: 94c845def4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722456

Change-Id: I1b29d8968570cf2735e96c9a16b98b3731e628a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 00:59:10 +00:00
Ronald Braunstein
d7eeaba58f Merge "Add adevice_fingerprint to eng builds." into main 2023-08-22 23:58:50 +00:00
Ronald Braunstein
c747c3419f Add adevice_fingerprint to eng builds. 
We are working on a replacement for "adb sync" and it requires something
running on the device to send back a fingerprint of the filesystem.
This binary is intendend to be part of developers going forward so we
are adding it in all eng/userdebug builds.
The binary is 830k bytes.

Test: m install-clean ; m ; acloud create --local-image ; adb shell ls -l /system/bin/adevice_fingerprint

Change-Id: I98359cc37cffeffc7ffbfd61d6bc9a51ba318a99
 2023-08-22 16:02:04 -07:00
Carlos Martinez Romero
7b4cf94d0c Merge "Add sfdo to the build." into main 2023-08-22 20:06:58 +00:00
Cole Faust
075d9622ff Ignore vndk compat symlinks in artifact path requirements 
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: Ie975b7450574d41bb13bb2179edc31ba4edd413e
 2023-08-22 11:58:17 -07:00
Chun-Yi Lee
935673291d Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef am: b704f738af am: 6d0f94b1f0 am: 43c81c6fda am: 6f883e4d11 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714

Change-Id: I4f11c2b75871a582041adc5f9704394127036534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 05:21:18 +00:00
Chun-Yi Lee
6f883e4d11 Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef am: b704f738af am: 6d0f94b1f0 am: 43c81c6fda 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714

Change-Id: Iaae51475fedf0c0418d0dd50a04647a37261f860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 04:35:55 +00:00
Chun-Yi Lee
6d0f94b1f0 Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef am: b704f738af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714

Change-Id: I2f8859ece12585bddcbbc302483097d95e4c21ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 03:33:12 +00:00
Chun-Yi Lee
6f09d105ef Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main 2023-08-22 02:11:23 +00:00
Chun-Yi Lee
ed72d33a9a Revert "Ignore vndk compat symlinks in artifact path requirements" 
Revert submission 2718295-colefaust_track_apex_compat_symlinks

Reason for revert: To validate if this change is causing the build breakage.

Reverted changes: /q/submissionid:2718295-colefaust_track_apex_compat_symlinks

Change-Id: I781cd6869daaf5931c5fabb5ca109502b1b52b3e
 2023-08-22 01:18:51 +00:00
Cole Faust
ecc016c8a7 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f am: b023d21043 am: cf483e91fb am: b038d13fba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: I64bbb91e111575195505a2694cd088c2e5675e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 00:36:03 +00:00
Cole Faust
b038d13fba Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f am: b023d21043 am: cf483e91fb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: Ic67f09632801bcced88587f63e520a75218c493a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 23:51:51 +00:00
Cole Faust
b023d21043 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: I042a54db2f74c465f6b3c82a384fa1719519dda3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 22:52:21 +00:00
Cole Faust
303e0450a6 Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-21 21:54:37 +00:00
Cole Faust
f7554e3735 Ignore vndk compat symlinks in artifact path requirements 
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: I46150c3b7a4eaac16c2daa80fec2a5640e32b61b
 2023-08-21 11:47:39 -07:00
Harshit Mahajan
2a453902a0 Merge "[CrashRecovery] Add module to BCP and SSCP" into main 2023-08-21 17:42:28 +00:00