Commit graph

5234 commits

Author SHA1 Message Date
Vilas Bhat
a142c0e47b 16k: raviole: Update PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO am: 081b179003
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2858065

Change-Id: I563b75033946881ef22f292597a7565857c67232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 14:08:47 +00:00
Vilas Bhat
081b179003 16k: raviole: Update PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
This is to help clarify that this flag doesn't mean the device
will actually work end-to-end with any page size.

Bug: 312541564
Change-Id: I9c68070d77d74cc9536961dd39dfbcce198975f1
2023-12-05 21:27:46 +00:00
Herbert Xue
88aa471023 Remove unused Android.mk under device/google/raviole am: bd9ce8035d
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2836216

Change-Id: If6a0c501f59dced35429f3d69547fdaf8e261126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:24:05 +00:00
Herbert Xue
bd9ce8035d Remove unused Android.mk under device/google/raviole
Bug: 311522698
Test: NA
Change-Id: Idd76734bcb56ff3480dcb11ffb0f617ccdbb94b6
2023-11-17 13:22:04 +08:00
Roshan Pius
d75de74bcb Merge "Revert "raviole(nfc): Modify NFC overlays for NFC apex"" into main am: f3e7300c21
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2818129

Change-Id: I0e691831753f60bcd4afc2b1823f86304896f4ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:49:04 +00:00
Roshan Pius
df8db2ed75 Revert "raven: Replace NFC app with NFC apex" am: 84b70f6ffc
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2817934

Change-Id: I113794f6a77439d33351b8b9cb6657c74936c049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:51 +00:00
Roshan Pius
f3e7300c21 Merge "Revert "raviole(nfc): Modify NFC overlays for NFC apex"" into main 2023-11-08 21:16:19 +00:00
Roshan Pius
84b70f6ffc Revert "raven: 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:c0c4781f17b3804c708ca3630d4c1161d5152b70)
Merged-In: I9298ad5be151b96e3b77301490feb8aaee3231b1
Change-Id: I9298ad5be151b96e3b77301490feb8aaee3231b1
2023-11-07 04:06:12 +00:00
Roshan Pius
d749a472a0 Revert "raviole(nfc): Modify NFC overlays for NFC apex"
Revert submission 2802548-nfc_apex

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:2802548-nfc_apex

Bug: 309117462
Test: Compiles, device boots up
Merged-In: I2716c95474b35fff59726c1cb9a54e5ea42f941e
Change-Id: I2716c95474b35fff59726c1cb9a54e5ea42f941e
2023-11-06 19:46:05 +00:00
Greg Kaiser
ffb744af7f Fix lunch choices for git_main am: 99f12f480a
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2811124

Change-Id: Icc9366529a269a065d3f2722808690eb7a664d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:11:14 +00:00
Greg Kaiser
99f12f480a 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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:08176b5882ebf16aed25d650aa474b3dc3d05c96)
Merged-In: I9778ab070155d18d4c67f31c9ff39863e7ba34af
Change-Id: I9778ab070155d18d4c67f31c9ff39863e7ba34af
2023-10-30 22:00:57 +00:00
Lokesh Kumar Goel
bab1d110df Update oriole SVN to 72 am: de8cd7d5e9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177134

Change-Id: I5e6459e90dd4b9e34dd16ffe636c970778e4eca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:59 +00:00
Lokesh Kumar Goel
c42d9e1215 Update raven SVN to 72 am: c56cc1ffe2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177133

Change-Id: I425997b8caf583412c3f2e1e7c6c83c1818ed981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:52 +00:00
Lokesh Kumar Goel
42c68635d0 Update raven SVN to 71 am: 91dbbaf6a2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25174557

Change-Id: Ie090ea59db0dc6057975e53356ba81e3df2d1f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:29 +00:00
Lokesh Kumar Goel
a56ff2d2d9 Update oriole SVN to 71 am: 024c12af32
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25176367

Change-Id: I43ae3e745a82673ede92003273302ae748fa7736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:26 +00:00
Roshan Pius
29e36a79a1 raviole(nfc): Modify NFC overlays for NFC apex am: 8c24309054
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2803464

Change-Id: Ib183cae865d2235c17e94dc350010cdb69239442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:35:52 +00:00
Roshan Pius
8c24309054 raviole(nfc): Modify NFC overlays for NFC apex
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: I9a6de12915c42f22cca35543e665ff0a003938dd
2023-10-25 14:56:26 -07:00
Lokesh Kumar Goel
de8cd7d5e9 Update oriole SVN to 72
Bug: 302612466
Change-Id: I8dd3b2389683050f017bbc09946bce8a14e979e8
2023-10-25 20:20:23 +00:00
Lokesh Kumar Goel
c56cc1ffe2 Update raven SVN to 72
Bug: 302612466
Change-Id: I0d77e8c5e8878196f73fc0cb86406e0ff2bceecc
2023-10-25 20:20:23 +00:00
Lokesh Kumar Goel
91dbbaf6a2 Update raven SVN to 71
Bug: 302612466
Change-Id: I8c74f60d0c0437585a1f4bf5ad9d43115ddcc8b1
(cherry picked from commit ed76e2420d)
2023-10-25 20:19:48 +00:00
Lokesh Kumar Goel
024c12af32 Update oriole SVN to 71
Bug: 302612466
Change-Id: If51fdd784e6f45e63331ce984e76632e2236a943
2023-10-25 19:47:18 +00:00
Roshan Pius
370433b1ea Merge "raven: Replace NFC app with NFC apex" into main am: 73a68dea0f am: ebd3d3a0fd
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2779334

Change-Id: I774fbd8f8b90bc2305aa5f52c87e00632d3a9879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:38:19 +00:00
Roshan Pius
ebd3d3a0fd Merge "raven: Replace NFC app with NFC apex" into main am: 73a68dea0f
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2779334

Change-Id: I6b022030d5260f193c83edfc3b20b63a310515e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:15:54 +00:00
Roshan Pius
73a68dea0f Merge "raven: Replace NFC app with NFC apex" into main 2023-10-16 18:31:02 +00:00
Roshan Pius
7ccd686ef7 raven: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
Merged-In: Ia234c14d666750f1c1dfeb22aa7f56fbd59593fa
Change-Id: Ia234c14d666750f1c1dfeb22aa7f56fbd59593fa
2023-10-13 18:04:42 +00:00
Cole Faust
d82fee1e4b Use PRODUCT_COPY_FILES to install uwb country files am: 4a96299e45 am: 43028647c5
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776726

Change-Id: I31aa0813f3c5b2cbdf3d33c62583f4fd395109d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 18:17:37 +00:00
Cole Faust
43028647c5 Use PRODUCT_COPY_FILES to install uwb country files am: 4a96299e45
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776726

Change-Id: Id38841d95d113621bb46f72da01707318847588e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 17:45:52 +00:00
Cole Faust
4a96299e45 Use PRODUCT_COPY_FILES to install uwb country files
Previously, these files were installed with a custom $(shell) command
in an Android.mk file. This doesn't let the build system know that
these files exist, and breaks hermetic partition builds.

Instead, install them with PRODUCT_COPY_FILES, and add a check that
the list is up-to-date.

Bug: 205632228
Test: Presubmits
Change-Id: Ib1b1bddd440f6e36daf81da6e51b42706c098ee8
2023-10-10 23:17:46 -07:00
Xin Li
7aa52b6271 [automerger skipped] Merge Android 14 am: 90d20c3c3d -s ours am: 0a394d0d24 -s ours
am skip reason: Merged-In I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0 with SHA-1 3aae814a0e is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776403

Change-Id: Icfac6e733f0e2d25ac21d904684dd282dfc3c208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:52 +00:00
Xin Li
0a394d0d24 [automerger skipped] Merge Android 14 am: 90d20c3c3d -s ours
am skip reason: Merged-In I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0 with SHA-1 3aae814a0e is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2776403

Change-Id: I2810332c53478734d2d26d096a99c70f0d78ff6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:48 +00:00
Xin Li
90d20c3c3d Merge Android 14
Bug: 298295554
Merged-In: I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0
Change-Id: Ic67ade7189c892e7e8348a63c42c846b06ba651c
2023-10-05 15:34:26 -07:00
Xin Li
dc619d507b [automerger skipped] Merge UP1A.231005.007 am: 22375460cc -s ours
am skip reason: Merged-In I073e25b8e4db19f9680e4ef7cda6baa7c265b925 with SHA-1 0f47de1ea2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24879262

Change-Id: I813b98cf661c2517584e04188ed0f5d4d542fa49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:41 +00:00
Xin Li
22375460cc Merge UP1A.231005.007
Bug: 291102124
Merged-In: I073e25b8e4db19f9680e4ef7cda6baa7c265b925
Change-Id: I421d5390595ae90ba0799f6c85da7937f3a0f2e3
2023-09-27 16:04:36 -07:00
Xin Li
65445183df Set the blew prebuilt apps to PRESIGNED am: 3aae814a0e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24843849

Change-Id: I6bac6473df60a45fc5354ba73bf58f77f609e788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 21:54:20 +00:00
Xin Li
3aae814a0e Set the blew prebuilt apps to PRESIGNED
Keep PixelQualifiedNetworksService platfrom key
Other apps are no need to re-sign

Bug: 290766628
Change-Id: I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0
2023-09-23 03:37:58 +00:00
Ankur Bakshi
5544a54921 Update raven SVN to 70 am: 4049cdb9a3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: I192ea839aa50e4f38939f9c5f37e36fe1edd6361
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:52:55 +00:00
Ankur Bakshi
1e63c12c5b Update raven SVN to 69 am: ff982eb8d2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: Ia921f65068b369a659a988ae33ca4046fd728860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:52:53 +00:00
Ankur Bakshi
cb5c18e22f Update oriole SVN to 70 am: 47b81f6904
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: Ic9a9ce676ecaa3c0e112c59e5f5d7c92a822c073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:51:28 +00:00
Ankur Bakshi
e26b268bae Update oriole SVN to 69 am: 8913112d57
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: Ie12f85ba2a2c8def80f5ddde117583ff2bdb0a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:49:13 +00:00
Ankur Bakshi
4049cdb9a3 Update raven SVN to 70
Bug: 298087649
Change-Id: If7417bddc6ef92cbaec5a5537f1260f0536268b5
2023-09-11 17:47:31 +00:00
Ankur Bakshi
ff982eb8d2 Update raven SVN to 69
Bug: 298087649
Change-Id: Icadf953c98a09298511239d30194383706858694
2023-09-11 17:47:31 +00:00
Xin Li
7030776f7d Set the blew prebuilt apps to PRESIGNED
Keep PixelQualifiedNetworksService platfrom key
Other apps are no need to re-sign

Bug: 290766628
Change-Id: I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0
2023-09-08 11:30:44 -07:00
Ankur Bakshi
47b81f6904 Update oriole SVN to 70
Bug: 298087649
Change-Id: I5e940376186311fe9d25e252c9080eef894707f2
2023-09-07 22:45:21 +00:00
Ankur Bakshi
8913112d57 Update oriole SVN to 69
Bug: 298087649
Change-Id: I43cf152ebc8c6f944a15e0135f6bcf0c686419bd
2023-09-06 23:04:50 +00:00
Xin Li
f70a342c35 [automerger skipped] Merge UP1A.230905.019 am: 7214b4eaa3 -s ours
am skip reason: Merged-In I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1 with SHA-1 45ec5947ad is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24624971

Change-Id: I9f930ce01b4737faaaa23da019d1d77bb0f61226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:29 +00:00
Xin Li
7214b4eaa3 Merge UP1A.230905.019
Merged-In: I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1
Change-Id: Iaf0487e1418188518ead01202f04e643c45cc2b3
2023-08-31 12:21:15 -07:00
Android Build Coastguard Worker
35b73abcd2 [coastguard skipped] Merge sparse cherrypicks from sparse-10740638-L17800000962853027 into udc-release.
COASTGUARD_SKIP: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0
COASTGUARD_SKIP: I3a1ab109d212a7cf666f622e3af8a9e7e2cd5d10
COASTGUARD_SKIP: I073e25b8e4db19f9680e4ef7cda6baa7c265b925

Change-Id: Id42df103f5a093cae50c64c3e1b832e8bfd67039
2023-08-30 23:18:01 +00:00
Android Build Coastguard Worker
cd72c7be31 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24439886', 'googleplex-android-review.googlesource.com/24439885'] into sparse-10740638-L17800000962853027.
SPARSE_CHANGE: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0
SPARSE_CHANGE: I073e25b8e4db19f9680e4ef7cda6baa7c265b925

Change-Id: I3a1ab109d212a7cf666f622e3af8a9e7e2cd5d10
2023-08-30 23:10:33 +00:00
Lokesh Kumar Goel
72fd8871aa Update oriole SVN to 68
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0f47de1ea25ab72a9dd50e13ff8217faab831d42)
Merged-In: I073e25b8e4db19f9680e4ef7cda6baa7c265b925
Change-Id: I073e25b8e4db19f9680e4ef7cda6baa7c265b925
2023-08-30 23:09:13 +00:00
Lokesh Kumar Goel
4793fddc60 Update raven SVN to 68
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:58d7ffaeeb22c8f074d2dd6318fcbd3158e5a3f0)
Merged-In: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0
Change-Id: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0
2023-08-30 23:09:05 +00:00