Jihoon Kang
608493e0ff
Revert "Disable from-text stub build for sdk products"
...
Revert submission 2832580-sdk-from-source-stub
Reason for revert: Breaking sdk builds
Reverted changes: /q/submissionid:2832580-sdk-from-source-stub
Change-Id: Id2e1bf4b5d513d12bb794405a74dfdbed870c4e1
2023-11-17 00:58:42 +00:00
Jihoon Kang
3621c914a6
Disable from-text stub build for sdk products
...
This change introduces `PRODUCT_BUILD_FROM_SOURCE_STUB` product
variable, which is set to true for sdk targets.
Test: m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_staging sdk and inspect ninja query to verify that stubs are built from source
Bug: 311203379
Change-Id: I99ad04fb6b61eebfeee68f23f8865ab55d69cdbd
2023-11-16 23:09:29 +00:00
Treehugger Robot
6ea8770753
Merge "Revert "[CrashRecovery] Add module to BCP and SSCP"" into main am: a463723f16
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2829637
Change-Id: If726500da1b4e6235a0dc54bc10d3d8d41ee70bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 12:10:42 +00:00
Treehugger Robot
a463723f16
Merge "Revert "[CrashRecovery] Add module to BCP and SSCP"" into main
2023-11-15 11:43:29 +00:00
Harshit Mahajan
1b22a8e7dd
Revert "[CrashRecovery] Add module to BCP and SSCP"
...
Revert submission 2789412-cherrypicker-L65800000963076834:N61100001405784943
Reason for revert: Leading to merge conflict
Bug: b/311082270
Reverted changes: /q/submissionid:2789412-cherrypicker-L65800000963076834:N61100001405784943
Change-Id: I2cbe26499ad5ce938db7cdd3ebaf9c2e48982de9
Merged-In: I39dfab62897d907023720b594d6929397403d314
2023-11-15 08:26:47 +00:00
Alyssa Ketpreechasawat
82f52a7cfc
Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d
am: 566f69178c
am: b02812d84c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531
Change-Id: Ia37497d25763fcd2ef563f2cc6097a9cae65737b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 20:42:55 +00:00
Alyssa Ketpreechasawat
566f69178c
Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531
Change-Id: I28dde980714a4eb4571f605c6e217f5750e8f6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 19:44:58 +00:00
Alyssa Ketpreechasawat
c7bc53999d
Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main
2023-11-14 19:13:32 +00:00
Florian Mayer
beb5bed41f
Increase scudo MTE buffer for fullmte devices
...
Bug: 309446692
Change-Id: Idfb7956a1f7031d908f026d120fe8e253976ff4f
2023-11-14 02:51:14 -08:00
Devin Moore
df7953616c
Merge changes from topic "revert-2818339-remove_hidl_memory-VHKFNXVYFO" into main am: 731d920878
am: a700ffcb1c
am: 59e44874c5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2828479
Change-Id: Icb87d1d96c922814aa4ab64a954e4500ac87be1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 22:59:32 +00:00
Devin Moore
49d8ce39e6
Reapply "Stop including android.hidl.memory ashmem impl on V+ devices"
...
This reverts commit 77393ba39d
.
Test: m && launch_cvd && adb shell ls /vendor/lib64/hw
Bug: 205764958
Bug: 310700278
Bug: 310680652
Change-Id: Ie631c666b42fbb4dc30ffd141dc8a7dbb62b2a51
2023-11-13 22:40:46 +00:00
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