Commit graph

9144 commits

Author SHA1 Message Date
Roland Levillain
3a442cc088 Update OWNERS files under build/make.
Test: n/a
Change-Id: I91e6eb90c2709e64a27f069f522a11374b99c91e
2024-01-02 18:40:38 +00:00
Jooyung Han
b2ea62d07c Install libvintf_jni
libvintf_jni is for android.os.{VintfObject, VintfRuntimeInfo} classes
and wraps the libvintf queries.

It's extracted from libandroid_runtime to avoid loading libvintf in
zygote processes.

Bug: 270169217
Test: atest VintfObjectTest
Change-Id: I653e4eb15bae91822d62e05224e743c17b00114c
2023-12-26 17:22:09 +09:00
Harry Cutts
dc8aeb2579 Merge "Include evemu-record command in system image" into main 2023-12-14 11:54:10 +00:00
Dan Shi
f877c1c7c4 Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main am: e8519a7bad am: c0d94d179a am: 17391cba39
Original change: https://android-review.googlesource.com/c/platform/build/+/2871792

Change-Id: I370421e6e101b3e5f078a6a7b86dc745ce7164b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13 20:55:05 +00:00
Dan Shi
e8519a7bad Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main 2023-12-13 19:19:16 +00:00
Harry Cutts
0942f74134 Include evemu-record command in system image
This command is useful for collecting input events that can then be used
to reproduce bugs or evaluate the quality of input code, for example.

Bug: 302297266
Test: build a system image, check it includes /system/bin/evemu-record
Ignore-AOSP-First: evemu-record is not present in AOSP yet
Change-Id: I21eb7d5dc8cef9c1dd797ba1ab2ee830a8a5a42b
2023-12-13 19:01:17 +00:00
Dan Shi
16490d3207 Revert "Allow to override fastboot-info.txt for specific board"
Revert submission 2871156-fastboot_info

Reason for revert: possble cause of b/315866782

Reverted changes: /q/submissionid:2871156-fastboot_info

Change-Id: I07baf20bd50529a36f2841350a24ba58d480f5e2
2023-12-13 18:58:49 +00:00
Dmitrii Merkurev
d63d6a7adb Merge "Allow to override fastboot-info.txt for specific board" into main am: aaf82ff626 am: 47abe8a42e am: a2191b0e4a
Original change: https://android-review.googlesource.com/c/platform/build/+/2871235

Change-Id: I607579e81d21af5982fc247bda504e245b84a128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13 04:25:17 +00:00
Dmitrii Merkurev
aaf82ff626 Merge "Allow to override fastboot-info.txt for specific board" into main 2023-12-13 02:56:12 +00:00
Dmitrii Merkurev
21eeb06291 Allow to override fastboot-info.txt for specific board
Introduce TARGET_BOARD_FASTBOOT_INFO_FILE to override
fastboot-info.txt generated by default

Test: locally with CF target on related change
Bug: 315811289
Change-Id: I52208e49ac1dfe8558849be9befa60df805665e3
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
2023-12-12 22:10:32 +00:00
Hansen Kurli
c46e7ab092 Merge "Remove racoon, mtpd, pppd, ip-up-vpn" into main am: f388a25f97 am: 3bdc58adee am: 993989ef94
Original change: https://android-review.googlesource.com/c/platform/build/+/2864095

Change-Id: I5a2c2d192c6d455c661c7b452e1ac5531437cc86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 10:26:03 +00:00
Hansen Kurli
3bdc58adee Merge "Remove racoon, mtpd, pppd, ip-up-vpn" into main am: f388a25f97
Original change: https://android-review.googlesource.com/c/platform/build/+/2864095

Change-Id: I9fa434f2b12917677ad298cf4fce071efdb436a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 09:21:57 +00:00
Hansen Kurli
f388a25f97 Merge "Remove racoon, mtpd, pppd, ip-up-vpn" into main 2023-12-08 08:52:16 +00:00
Hansen Kurli
fa92526d35 Remove racoon, mtpd, pppd, ip-up-vpn
Legacy VPN types are removed. These are now unused.

Bug: 161776767
Test: m
Change-Id: I2ccc10d9c8680a6de9160e07e726312bc7b1fdc9
2023-12-07 19:20:14 +08:00
Roshan Pius
c5a6d4ca60 Merge "Revert "Revert "handheld_system: Use build flag for NFC stack in..."" into main am: d5074b3d7d am: ed97f85120 am: 567062eaa0
Original change: https://android-review.googlesource.com/c/platform/build/+/2858127

Change-Id: Ib7dd0132dd8cb0b4f515b4e98a8410c577f3fdb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 17:20:35 +00:00
Roshan Pius
ed97f85120 Merge "Revert "Revert "handheld_system: Use build flag for NFC stack in..."" into main am: d5074b3d7d
Original change: https://android-review.googlesource.com/c/platform/build/+/2858127

Change-Id: Ia5e6cf96003cc6929a6e54f8b9265efbdd90cc4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 16:07:00 +00:00
Roshan Pius
57c1fa5d11 Revert "Revert "handheld_system: Use build flag for NFC stack in..."
Revert submission 25548952-revert-25531363-nfc_apex_reland_flags-TJRICWNQNN

Reason for revert: Reland with build failure fix.

Reverted changes: /q/submissionid:25548952-revert-25531363-nfc_apex_reland_flags-TJRICWNQNN

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:76cf501a8ae2965d61937c2a8aab99698cb41c20)
Merged-In: Ic8fdadeaf49eafb2119a94e6dd61b808c60fad96
Change-Id: Ic8fdadeaf49eafb2119a94e6dd61b808c60fad96
2023-12-05 05:42:12 +00:00
Liming Wu
291816f210 Merge "Revert "handheld_system: Use build flag for NFC stack inclusion"" into main 2023-12-04 23:49:57 +00:00
Liming Wu
bf8ff2944f Revert "handheld_system: Use build flag for NFC stack inclusion"
Revert submission 25531363-nfc_apex_reland_flags

Reason for revert: < Build Break: https://android-build.googleplex.com/builds/culprit-assistant/run/40f1ef34-1727-4106-abd0-f064d6d0f781>

Bug:  314799938

Reverted changes: /q/submissionid:25531363-nfc_apex_reland_flags

Change-Id: I4cbc4eb47837bbd3d52010c18479500def7da434
2023-12-04 23:16:08 +00:00
Treehugger Robot
33c9186a36 Merge "handheld_system: Use build flag for NFC stack inclusion" into main 2023-12-04 17:40:04 +00:00
Roshan Pius
dfdfb0bea7 handheld_system: Use build flag for NFC stack inclusion
Will be used to switch from the current NFC APK to new NFC mainline module.

Bug: 303286040
Test: Compiles
Change-Id: If2d6d0248faabe19e173074aacbe5f960f026fb5
2023-12-01 19:37:05 +00:00
Roshan Pius
d2f4f984cf Merge "build(nfc): Create framework-nfc sdk library" into main am: 999d9a1924
Original change: https://android-review.googlesource.com/c/platform/build/+/2828697

Change-Id: Ie716fe1916adb2dc42045eeef84b8cc16d2aac20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:20:31 +00:00
Roshan Pius
999d9a1924 Merge "build(nfc): Create framework-nfc sdk library" into main 2023-12-01 17:12:39 +00:00
Mark White
530142a35a framework-minus-apex build should include framework-res
If an eng modifies a Framework resource and builds 'framework-minus-apex' it should rebuild framework-res

Test: m framework-minus-apex
Bug: 311452668
Ignore-AOSP-First: merge conflicts, need to be merged in downstream first
Change-Id: Ia8a7df9ce7c74bd942686ea520361f55fe4a42eb
2023-12-01 16:13:50 +00:00
Treehugger Robot
8e2fec72ce Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de am: 38bfccfdc9 am: 92c4d85ee3
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967

Change-Id: Ibab1ced474f6b93711cdadb1ceab087da1b056e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 04:06:09 +00:00
Treehugger Robot
92c4d85ee3 Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de am: 38bfccfdc9
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967

Change-Id: I12bfe69bc530d58c448c6293d825b0a8dbbe8b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 03:34:46 +00:00
Treehugger Robot
8e0c07166d Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967

Change-Id: Idec248d0fb251cf6aca35ba6a5af1f6eeb8ef9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 03:25:27 +00:00
Treehugger Robot
1a9dd1c7de Merge "Increase scudo MTE buffer for fullmte devices" into main 2023-12-01 02:52:38 +00:00
Jiakai Zhang
9c37651cdc Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main am: 1f61e734d6 am: 9b03e697a0 am: 7a0c1d99cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2847398

Change-Id: I8f27633297cfec61fc3c7f92d198782e36f9416e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 11:54:16 +00:00
Jiakai Zhang
7a0c1d99cd Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main am: 1f61e734d6 am: 9b03e697a0
Original change: https://android-review.googlesource.com/c/platform/build/+/2847398

Change-Id: I26e69a20f89edae072e096e2d8933fec0c305532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 11:23:26 +00:00
Jiakai Zhang
e1dd0563b3 Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main am: 1f61e734d6
Original change: https://android-review.googlesource.com/c/platform/build/+/2847398

Change-Id: Ib519b83b3700a4014d5b5d9d868dc73c9cb5219c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 10:50:42 +00:00
Jiakai Zhang
364e9c39de Remove PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK.
This was added by r.android.com/513843 to force dexpreopt some GMS core
modules even if dexpreopt is disabled, to avoid some memory usage
regression. We no longer need it because dexpreopt is never disabled on
production builds.

Bug: 313505540
Test: m
Change-Id: Iff7f1d340a3ecd64cdc3d2f83f9c37c109a81fda
2023-11-28 13:46:13 +00:00
Jiakai Zhang
8737d4baf5 Set dalvik.vm.disable-art-service-dexopt=true on eng build.
We can't set all the `pm.dexopt.*` properties to `skip` because there
are product configs that have set those properties and therefore
conflict with our settings.

Bug: 313505540
Test: (on internal main) -
  1. `lunch` an eng build of an internal Go device.
  2. m
Change-Id: Ia3306d0c5d721e84b5cd5ab019302bb644f6de72
2023-11-28 13:43:52 +00:00
Jan Sebechlebsky
8deb7714a2 Move virtual camera service (build flag)
from base_system.mk to handheld_system.mk.
Virtual camera service doesn't make sense on devices
without camera server (which is defined in handheld_system.mk).

Bug: 301023410
Bug: 311679099
Test: build
Ignore-AOSP-First: Virtual Camera HAL target is not merged in AOSP.
Change-Id: I67c18cfa7a2717cce738b17a53199fa595254068
2023-11-22 18:32:56 +00:00
Pascal Muetschard
d3b47f410b Move counter producer off of vendor partition.
Although the binary looks for a vendor provided shared library,
it is an otherwise vendor agnostic tool. Moving it off the
vendor partition also has the added benefit of it not requiring
root to be run.

Bug: b/273907878
Test: manual
Ignore-AOSP-First: change in topic with internal-first project
Change-Id: Ib7d317fdba39bbe8a61ece1e3052ebc334b5a274
2023-11-21 16:02:29 +00:00
Treehugger Robot
6893cf828c Merge "Add HIDL support services to telephony_system_ext" into main am: 99ec4c5bff am: bc2fe4f526 am: 891a28ab5d
Original change: https://android-review.googlesource.com/c/platform/build/+/2838551

Change-Id: I3d3d0da759d9e56f6947c697c34754532b961ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 06:00:50 +00:00
Treehugger Robot
bc2fe4f526 Merge "Add HIDL support services to telephony_system_ext" into main am: 99ec4c5bff
Original change: https://android-review.googlesource.com/c/platform/build/+/2838551

Change-Id: I28bab7429533874f22f2130982c568e0aab39500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:56:31 +00:00
Treehugger Robot
99ec4c5bff Merge "Add HIDL support services to telephony_system_ext" into main 2023-11-21 04:15:59 +00:00
Treehugger Robot
153750efd8 Merge "Add HIDL support services to handheld system_ext" into main am: 9955a2ca6c am: f7f3b97748 am: 709c88b380
Original change: https://android-review.googlesource.com/c/platform/build/+/2838469

Change-Id: Ib18fdcb9d3bb46b2066e7c889a6d2cb7b4fb7d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:05:29 +00:00
Treehugger Robot
f7f3b97748 Merge "Add HIDL support services to handheld system_ext" into main am: 9955a2ca6c
Original change: https://android-review.googlesource.com/c/platform/build/+/2838469

Change-Id: I87701abca5d9f2b1b8646de5b94ad76552b8dc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 03:32:58 +00:00
Devin Moore
e80691f1c7 Add HIDL support services to telephony_system_ext
Some devices don't use base_system_ext.mk and instead use
telephony_system_ext.mk.
These also need the HIDL support services for devices launched before V.

Test: m
Bug: 305873288
Change-Id: I9a92c274291f547f607556eacf9f3d641350aa87
2023-11-21 02:58:57 +00:00
Treehugger Robot
9955a2ca6c Merge "Add HIDL support services to handheld system_ext" into main 2023-11-21 02:54:37 +00:00
Devin Moore
97cb15a1f5 Add HIDL support services to handheld system_ext
Some devices don't use base_system_ext.mk and instead use
handheld_system_ext.mk.
These also need the HIDL support services for devices launched before V.

Test: m
Bug: 305873288
Change-Id: Ic482216fa49c12f52668a499dedaa1ed19c0c4a7
2023-11-21 02:03:59 +00:00
Avichal Rakesh
0fc77d0243 Merge "Update current.txt with new cameraservice vndk interfaces" into main 2023-11-21 00:45:34 +00:00
Devin Moore
0c5965adf6 Merge "Respect PRODUCT_PACKAGES_SHIPPING_API_LEVEL in artifact path checker" into main am: ca2c656091 am: 5a2b449c31 am: bf5a497329
Original change: https://android-review.googlesource.com/c/platform/build/+/2838539

Change-Id: Ibbbcebfc34f9a07106728985af28265ab350cf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 23:53:08 +00:00
Devin Moore
5a2b449c31 Merge "Respect PRODUCT_PACKAGES_SHIPPING_API_LEVEL in artifact path checker" into main am: ca2c656091
Original change: https://android-review.googlesource.com/c/platform/build/+/2838539

Change-Id: I5314dea9486a040f24882de5048b4b7e675c1701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 22:34:36 +00:00
Devin Moore
ca2c656091 Merge "Respect PRODUCT_PACKAGES_SHIPPING_API_LEVEL in artifact path checker" into main 2023-11-20 21:49:35 +00:00
Devin Moore
d47e194115 Respect PRODUCT_PACKAGES_SHIPPING_API_LEVEL in artifact path checker
Test: lunch gsi_tv_arm-userdebug  && m
Bug: 299166571
Change-Id: Ic2ceab29967ef5343dc924c52e0928ada06671f8
2023-11-20 20:45:58 +00:00
Devin Moore
755972cd8a Merge changes from topic "reland_hidl_mapper_removal" into main am: 8faa4a5880 am: 61fc96366b am: a5be729a43
Original change: https://android-review.googlesource.com/c/platform/build/+/2828695

Change-Id: I22ca441dc2b0ede3a4dfb245946994446a2f27d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18 01:15:23 +00:00
Devin Moore
61fc96366b Merge changes from topic "reland_hidl_mapper_removal" into main am: 8faa4a5880
Original change: https://android-review.googlesource.com/c/platform/build/+/2828695

Change-Id: I6009b4b6a6f90cd392b5aea970f686f39780bea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18 00:11:51 +00:00
Devin Moore
8faa4a5880 Merge changes from topic "reland_hidl_mapper_removal" into main
* changes:
  Reapply "Stop including android.hidl.memory ashmem impl on V+ devices"
  Reapply "Remove android.hidl.memory library from the VNDK"
2023-11-18 00:01:21 +00:00
Roshan Pius
1da63a9bd7 Merge "build(nfc): Create framework-nfc sdk library" into main 2023-11-17 22:43:32 +00:00
Roshan Pius
1cbdc45437 build(nfc): Create framework-nfc sdk library
Using `framework-location` as reference.

Ignore-AOSP-First: Submitting separately to avoid merge conflicts. See
aosp/2828697
Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases

Change-Id: I4b9901d2b3924157caebad0d083c4beacbad9749
2023-11-17 14:40:47 -08:00
Roshan Pius
58f0337f22 build(nfc): Create framework-nfc sdk library
Splits out the NFC API classes that are going to be part of NFC mainline
module. Uses `framework-location` as reference.

Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
Merged-In: I4b9901d2b3924157caebad0d083c4beacbad9749
Change-Id: I4b9901d2b3924157caebad0d083c4beacbad9749
2023-11-17 22:37:47 +00:00
Alyssa Ketpreechasawat
995fb11297 Merge "Revert "Revert "Added new framework-pdf jar inside MediaProvider..."" into main am: 35fd025c5c am: d87eef3862 am: de9c5ef71f
Original change: https://android-review.googlesource.com/c/platform/build/+/2822536

Change-Id: Ibd57d2c1c45eb42b6b5722e7d1bf7d9646515566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 11:40:04 +00:00
Jihoon Kang
3c75f70f3d Merge "Revert^2 "Disable from-text stub build for sdk products"" into main am: 03aa6e725e am: 1644e0c15e am: 455b1835b6
Original change: https://android-review.googlesource.com/c/platform/build/+/2836090

Change-Id: I5c525a7110412e0c85b2e4c8b29b9328970e794e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 11:39:14 +00:00
Alyssa Ketpreechasawat
d87eef3862 Merge "Revert "Revert "Added new framework-pdf jar inside MediaProvider..."" into main am: 35fd025c5c
Original change: https://android-review.googlesource.com/c/platform/build/+/2822536

Change-Id: I5dcccfe5d7bb5efb16d08b229cde76ca67811bb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 11:09:40 +00:00
Alyssa Ketpreechasawat
35fd025c5c Merge "Revert "Revert "Added new framework-pdf jar inside MediaProvider..."" into main 2023-11-17 10:30:17 +00:00
Jihoon Kang
1644e0c15e Merge "Revert^2 "Disable from-text stub build for sdk products"" into main am: 03aa6e725e
Original change: https://android-review.googlesource.com/c/platform/build/+/2836090

Change-Id: Id32152443558e7b6c18d8d6d38a424603068bf59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 10:16:57 +00:00
Avichal Rakesh
7e8fc43717 Update current.txt with new cameraservice vndk interfaces
CameraService vNDK has been updated to use ANativeWindow
instead of NativeHandles. This CL updates the current.txt
file to include the latest revision of the interfaces.

Bug 283283111
Test: Compiled Successfully.
Ignore-AOSP-First: Interface version change is currently
                   internal only

Change-Id: Idb458e63bf73349b08dc1505b8e86b59f4843af4
2023-11-16 20:56:32 -08:00
Jihoon Kang
9ff93095c7 Merge "Revert "Disable from-text stub build for sdk products"" into main am: 3666e601ec am: b0146455c7 am: c1fc7602aa
Original change: https://android-review.googlesource.com/c/platform/build/+/2835872

Change-Id: I886f8687143a8a1f68b7ddcec2bcf33ce87cf230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 02:08:20 +00:00
Treehugger Robot
1b6087fdf9 Merge "Disable from-text stub build for sdk products" into main am: b0d8fafba8 am: 5d763858eb am: 0f20cbc643
Original change: https://android-review.googlesource.com/c/platform/build/+/2834692

Change-Id: If31d0a71056e952085ffcbaf310d8d7622e4f8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 02:07:49 +00:00
Jihoon Kang
9e0998b777 Revert^2 "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.

This change resubmits https://r.android.com/2834692.

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: I7d9f833ae76ceabbf2ce4df0141688e24ea164c8
2023-11-17 01:52:12 +00:00
Jihoon Kang
b0146455c7 Merge "Revert "Disable from-text stub build for sdk products"" into main am: 3666e601ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2835872

Change-Id: Ifda62b2e985c5e47b7a1f40351b5fb063b51a42c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 01:20:06 +00:00
Treehugger Robot
5d763858eb Merge "Disable from-text stub build for sdk products" into main am: b0d8fafba8
Original change: https://android-review.googlesource.com/c/platform/build/+/2834692

Change-Id: I9cf9c532ae3eb1b94bead4400b0aef1172d818eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 01:04:08 +00:00
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
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