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