Commit graph

6372 commits

Author SHA1 Message Date
Xin Li
d76ec15e36 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: Id59e87e47845cbb2187588f623f1e981c0bfd3da
Change-Id: Ic2c3da23ae97392047b91e8d378d238e39abeb94
2024-05-06 12:09:16 -07:00
Nelson Li
2dd9ebfb37 Convert slider/preloaded_nanoapps.json's .mk file to Android.bp.
Since `preloaded_nanoapps.json` has different configurations for
`factory` products and `non-factory` products, `soong_namespace {}`
needs to be added to the converted Android.bp file to avoid misuse.

Additionally, due to ag/27170565, ag/27170566, a common inheritance
layer has been added to all `non-factory` products. Therefore, setting
different `PRODUCT_SOONG_NAMESPACES` in the corresponding
`<DEVICE>_generic.mk` and `factory_<DEVICE>.mk` files will allow
factory products and non-factory products to use different
preloaded_nanoapps.json.

Bug: 338332183
Test: 1. lunch <product_name>-trunk_staging-userdebug && \
         m -j preloaded_nanoapps.json
      2. Check ./out/target/product/<device_name>/.../preloaded_nanoapps.json
         It should be the <device_name> version.
      3. lunch factory_<device_name>-trunk_staging-userdebug && \
         m -j preloaded_nanoapps.json
      4. Check ./out/target/product/<device_name>/.../preloaded_nanoapps.json
         It should be the factory version.
Change-Id: I97798f0e7876ceb016a31f7da74508fe5a701915
2024-05-06 02:22:05 +00:00
Nelson Li
0b36ca29a6 Refactor product inheritance for raven products
Add an additional layer of inheritance for `aosp_raven`,
`aosp_raven_64`, `aosp_raven_pkvm`, `aosp_raven_pgagnostic_64`,
`aosp_raven_hwasan`, and `aosp_raven_61`.

This change adds a common layer of inheritance for non-factory
products (raven_generic.mk). This makes it easier to configure
factory and non-factory products differently.

Non-factory `raven` products now inherits from
`device/google/raviole/raven_generic.mk` which inherit from
`device/google/raviole/device-raven.mk`.

aconfig flags: Flag: EXEMPT mechanical refactoring
build flags: Flag: EXEMPT mechanical refactoring

Bug: 338005353
Test: lunch aosp_raven-trunk_staging-userdebug && m
      lunch aosp_raven_64-trunk_staging-userdebug && m
      lunch aosp_raven_pkvm-trunk_staging-userdebug && m
      lunch aosp_raven_pgagnostic_64-trunk_staging-userdebug && m
      lunch aosp_raven_hwasan-trunk_staging-userdebug && m
      lunch aosp_raven_61-trunk_staging-userdebug && m
Change-Id: Id5faed5a4be4c6480ee64654203d7f7e840c5c23
2024-05-06 01:10:49 +00:00
Android Build Coastguard Worker
f4090f30e0 Snap for 11800966 from 2a09185780 to 24Q3-release
Change-Id: I6e925f8605df5973caa83cf7c4b40bf4e36cc6f3
2024-05-04 01:03:00 +00:00
Qian-Hao Huang
2a09185780 Load fips140.ko before all other kernel modules
Bug: 337838109
Bug: 331791671
Change-Id: I4186255ad1b9baccf4f2c1e65560515aa6dc42a2
Signed-off-by: Qian-Hao Huang <qhhuang@google.com>
2024-05-03 07:03:18 +00:00
Nelson Li
89304e99bb Refactor product inheritance for whitefin products
Add an additional layer of inheritance for `aosp_whitefin`,
`aosp_whitefin_64`, `aosp_whitefin_pkvm`, and `aosp_whitefin_hwasan`.

This change adds a common layer of inheritance for non-factory
products (whitefin_generic.mk). This makes it easier to configure
factory and non-factory products differently.

Non-factory `whitefin` products now inherits from
`device/google/raviole/whitefin_generic.mk` which inherit from
`device/google/raviole/device-whitefin.mk`.

aconfig flags: Flag: EXEMPT mechanical refactoring
build flags: Flag: EXEMPT mechanical refactoring

Bug: 338332183
Bug: 338332464
Test: lunch aosp_whitefin-trunk_staging-userdebug && m
      lunch aosp_whitefin_64-trunk_staging-userdebug && m
      lunch aosp_whitefin_pkvm-trunk_staging-userdebug && m
      lunch aosp_whitefin_hwasan-trunk_staging-userdebug && m
Change-Id: I151d3e59141e566fad54f62ac01ab4372522fd5f
2024-05-03 00:53:24 +00:00
Nelson Li
4d90bc1647 Refactor product inheritance for slider products
Add an additional layer of inheritance for `aosp_slider`,
`full_slider`, and `aosp_slider_hwasan`.

This change adds a common layer of inheritance for non-factory
products (slider_generic.mk). This makes it easier to configure
factory and non-factory products differently.

Non-factory `slider` products now inherits from
`device/google/raviole/slider_generic.mk` which inherit from
`device/google/raviole/device-slider.mk`.

aconfig flags: Flag: EXEMPT mechanical refactoring
build flags: Flag: EXEMPT mechanical refactoring

Bug: 338332183
Bug: 338333277
Test: lunch aosp_slider-trunk_staging-userdebug && m
      lunch full_slider-trunk_staging-userdebug && m
      lunch aosp_slider_hwasan-trunk_staging-userdebug && m
Change-Id: If0bbcdf2d4de3c2eca14e514b863f7416ef12e45
2024-05-02 07:30:50 +00:00
Android Build Coastguard Worker
5117eef263 Snap for 11784291 from 0ee0ed9661 to 24Q3-release
Change-Id: I23fe648eedfd5f0a4b8927b74a0d300e852cadf9
2024-04-30 23:03:34 +00:00
Android Build Coastguard Worker
8ea8b9eb0e Snap for 11778614 from b26532f95e to 24Q3-release
Change-Id: Id5837434a766407ea5f43ea8934f06d1f2f15452
2024-04-29 23:02:46 +00:00
Juan Yescas
0ee0ed9661 16kb: Set platform elf alignment to 16kb for raviole targets am: d568b025b3 am: 479cbee36e
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/3063575

Change-Id: I1f10a95108f2a5e608278745fc9e2c23f5b64cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 21:38:22 +00:00
Juan Yescas
479cbee36e 16kb: Set platform elf alignment to 16kb for raviole targets am: d568b025b3
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/3063575

Change-Id: I07efc06edc51c699ed0f618d5c33a256842d55c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 21:19:30 +00:00
Matt Buckley
5e29ddf52b Add POWER_EFFICIENCY uclamp max to adpf config
Add the "UclampMax_Efficient" value to the ADPF config in the
powerhint.json in order to allow efficient core scheduling for this
device.

Bug: 277285195
Test: manual
Change-Id: I3435eb6fce99afe732623dec813311a19623fde6
2024-04-29 19:42:06 +00:00
Wei Li
b26532f95e Move license metadata declarations to meta-lic.mk and remove the Android.mk file. am: 87ab726d0f am: f46d0c27e5
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/3063227

Change-Id: Id660544670d348e03f73aad1a4b3a7368fae1941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 19:06:07 +00:00
Wei Li
f46d0c27e5 Move license metadata declarations to meta-lic.mk and remove the Android.mk file. am: 87ab726d0f
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/3063227

Change-Id: I2d4d47dfb0608dd5e95011cc75a9571d11f13505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 18:49:13 +00:00
Juan Yescas
d568b025b3 16kb: Set platform elf alignment to 16kb for raviole targets
Test: source build/envsetup.sh
      lunch aosp_raven_pgagnostic-trunk-userdebug
      m
Bug: 310232825
Change-Id: I9c62dcb94bc01dc7f3b76da7d8c9bb1c18ea6a2a
2024-04-29 11:35:23 -07:00
Wei Li
87ab726d0f Move license metadata declarations to meta-lic.mk and remove the Android.mk file.
Bug: 311522698
Test: CIs
Change-Id: Id7daef4f9a9b0e95764493a5336ec6c6240304ba
2024-04-26 12:22:24 -07:00
Android Build Coastguard Worker
3fde460022 Snap for 11740859 from edd9532ef3 to 24Q3-release
Change-Id: I66d7ae0d71d578f64d4b94c47653a3a6c6a0a251
2024-04-20 01:02:33 +00:00
Cyan_Hsieh
edd9532ef3 Switch bootloader directory to control by build flag
Bug: 333834221
Change-Id: I2d8ad5079fcd2b8d76148decb996cab0dd375dfb
2024-04-18 15:26:16 +08:00
Android Build Coastguard Worker
d7778ba90f Snap for 11728787 from 4ecf6b4755 to 24Q3-release
Change-Id: I7efa6131115b2b31792db49e802d1828d943ecfb
2024-04-17 23:04:01 +00:00
Cyan_Hsieh
4ecf6b4755 Branch bootloader prebuilts for 24Q3 release
Bug: 326002225
Change-Id: Ibc0b69bd4e5156ca0f6e51a5b2a55fc6e93471f8
2024-04-17 14:19:36 +00:00
Android Build Coastguard Worker
f5e5607d88 Snap for 11722130 from c55ff3407c to 24Q3-release
Change-Id: Ied082e9a83ca70f054ade21b6a7e932e36a892f9
2024-04-16 23:02:52 +00:00
Cyan_Hsieh
c55ff3407c Switch default kernel directory and change build flag naming
Bug: 309749142
Change-Id: If05bbfd7d4b79993fe10c1a206ce78fd3c3e3e5c
2024-04-16 01:34:13 +00:00
Android Build Coastguard Worker
e378bcd18b Snap for 11697857 from ac95e3badc to 24Q3-release
Change-Id: I2b63983be8531b42afe31c28e96d9897aaf65e43
2024-04-10 23:02:39 +00:00
Jimmy Shiu
ac95e3badc powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values am: e448b6f861
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/26905138

Change-Id: Ie7caff3de24b60707d5043eef85bc5bb183d092f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 16:37:23 +00:00
Jimmy Shiu
e448b6f861 powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values
Bug: 329483662
Test: Manual Test
Change-Id: Id0e0ac998b3da529c9d07d5c1dc25037b46c5f9a
2024-04-10 11:45:05 +00:00
Android Build Coastguard Worker
6b9a1aab5d Snap for 11685790 from e626be7a92 to 24Q3-release
Change-Id: Ieb921755ad6ce9731d33c0694fc01bdcd3585aa2
2024-04-08 23:02:37 +00:00
Melvin Huang
e626be7a92 R4O6: : Update BQR Event Mask property value
Bug: 331942476
Test: Build Pass
Change-Id: I737f969b4ac95ec84ff6f26561e0da1c64def093
2024-04-08 11:37:31 +00:00
Android Build Coastguard Worker
68127eb1dc Snap for 11679388 from 5f1473c89d to 24Q3-release
Change-Id: Ie65a739e669295182c7811a9df4e9180de1e8be5
2024-04-06 01:02:31 +00:00
Ankur Bakshi
5f1473c89d Update raven SVN to 83
Bug: 330382848
Change-Id: I912e6b183cb6f8f4d996d082f8da50ae8b09b337
2024-04-05 02:13:13 +00:00
Ankur Bakshi
eec592871f Update oriole SVN to 83
Bug: 330382848
Change-Id: I7e4511d4c55bf6ba9cf58400cff7f0551a198638
2024-04-05 02:13:13 +00:00
Android Build Coastguard Worker
f8d4281aca Snap for 11666018 from ec0b8256e7 to 24Q3-release
Change-Id: I3e014c3221ab294302ef5acbf34c5efc32f913c5
2024-04-03 23:02:32 +00:00
Jimmy Shiu
ec0b8256e7 powerhint: set uclampmin_init value for applying CPU Load boost am: 158e5fb33e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/26809489

Change-Id: Ie2bfd655ec4ef36109a01c0bea2f9489e67f9fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-03 04:19:43 +00:00
Jimmy Shiu
158e5fb33e powerhint: set uclampmin_init value for applying CPU Load boost
Bug: 329483662
Test: Manual Test
Change-Id: Ic8490589ee2521d8a6295b701cc169dbc8302e49
2024-04-03 01:04:44 +00:00
Android Build Coastguard Worker
b9738e6f46 Snap for 11635697 from 4b6dd87db0 to 24Q3-release
Change-Id: I34d393b4695a946a4bd69024037dcb67850c1f14
2024-03-27 23:02:54 +00:00
Android Build Coastguard Worker
f8d8b994b7 Merge cherrypicks of ['googleplex-android-review.googlesource.com/26229408', 'googleplex-android-review.googlesource.com/26239265', 'googleplex-android-review.googlesource.com/26243134', 'googleplex-android-review.googlesource.com/26241623', 'googleplex-android-review.googlesource.com/26241621', 'googleplex-android-review.googlesource.com/26240611', 'googleplex-android-review.googlesource.com/26464955', 'googleplex-android-review.googlesource.com/26465199'] into 24Q2-release.
Change-Id: I5445ca424fef2bb6ca5a04f0d701f0ff368858b0
2024-03-26 23:38:13 +00:00
Ankur Bakshi
2ae7372fd4 Update raven SVN to 82
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4b6dd87db01d718816d8a5a3c8e0d382a5f06631)
Merged-In: I2d9b565dd6e97439876096ae7e5c88678b178087
Change-Id: I2d9b565dd6e97439876096ae7e5c88678b178087
2024-03-26 23:31:50 +00:00
Ankur Bakshi
e2a9ca6c9b Update oriole SVN to 82
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fb927e4184ea67ca3e4b09bd9138e474538725a4)
Merged-In: I35f54125ce811d5788dc4bb779da6cb0da97c1b3
Change-Id: I35f54125ce811d5788dc4bb779da6cb0da97c1b3
2024-03-26 23:31:38 +00:00
Ankur Bakshi
968ff49300 Update raven SVN to 81
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75f2060945123abce1528e1fbc4828e3541a334c)
Merged-In: Id52b92f08a2ab38985ad4df391d904548c21d8ed
Change-Id: Id52b92f08a2ab38985ad4df391d904548c21d8ed
2024-03-26 23:31:24 +00:00
Ankur Bakshi
ffc8b9f2ae Update oriole SVN to 81
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f5439f1e844dedd9f8a96b29a2e1ced3270f3ef4)
Merged-In: I52b41275757b3b6ed9335412c00b2244c040298d
Change-Id: I52b41275757b3b6ed9335412c00b2244c040298d
2024-03-26 23:31:10 +00:00
Ankur Bakshi
898836abeb Update raven SVN to 80
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a5d57c7d7c7ce19e77d9e958547f76de47a62237)
Merged-In: I215f2ff08b59afa8c2de01edc13e0478fa16f4aa
Change-Id: I215f2ff08b59afa8c2de01edc13e0478fa16f4aa
2024-03-26 23:30:55 +00:00
Ankur Bakshi
8ac7db2617 Update oriole SVN to 80
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:38c977c9ad750183e9a117423fc5b7016f87e766)
Merged-In: I9d8db34bb775bb8a24dffccdc203df3f04c1a279
Change-Id: I9d8db34bb775bb8a24dffccdc203df3f04c1a279
2024-03-26 23:30:40 +00:00
Ankur Bakshi
5bfc263d9a Update raven SVN to 79
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4104a4d4b5de569f1a1b2e386305d66116f808fb)
Merged-In: Ic942d23db321ac036f4ad3ace6ef7b1291797b2d
Change-Id: Ic942d23db321ac036f4ad3ace6ef7b1291797b2d
2024-03-26 23:30:27 +00:00
Ankur Bakshi
2d2bbf51e1 Update oriole SVN to 79
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e6eb11886e2585187a2f277f3740c334d02574df)
Merged-In: I7e6ba5fad48ee6b94f8452596c819bdf64b1c567
Change-Id: I7e6ba5fad48ee6b94f8452596c819bdf64b1c567
2024-03-26 23:30:09 +00:00
Ankur Bakshi
4b6dd87db0 Update raven SVN to 82
Bug: 325156176
Change-Id: I2d9b565dd6e97439876096ae7e5c88678b178087
2024-03-26 22:20:35 +00:00
Ankur Bakshi
fb927e4184 Update oriole SVN to 82
Bug: 325156176
Change-Id: I35f54125ce811d5788dc4bb779da6cb0da97c1b3
2024-03-21 21:42:52 +00:00
Android Build Coastguard Worker
8979e805cd Snap for 11603317 from 75f2060945 to 24Q3-release
Change-Id: I226987ee1cc7c93f459a1ab7c21f6e86d15455d1
2024-03-20 23:02:52 +00:00
Android Build Coastguard Worker
8b7cc071be Merge cherrypicks of ['googleplex-android-review.googlesource.com/26012060'] into 24Q2-release.
Change-Id: I3384b81f4a2c782b2912acfa08817aed4dd13e23
2024-03-20 21:30:19 +00:00
Cheng Chang
d58c3333b4 gps: Disable Vzw SUPL OTDOA
Bug: 322404137
Test: OTDOA test in b/322404137
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8dbd03c2dffe8361a3813a71eb27fb55ff9854ef)
Merged-In: I026a3f8270b4b609d5a33f0604ade8586f426ee5
Change-Id: I026a3f8270b4b609d5a33f0604ade8586f426ee5
2024-03-20 21:23:35 +00:00
Ankur Bakshi
75f2060945 Update raven SVN to 81
Bug: 325156176
Change-Id: Id52b92f08a2ab38985ad4df391d904548c21d8ed
2024-03-20 05:01:16 +00:00
Ankur Bakshi
f5439f1e84 Update oriole SVN to 81
Bug: 325156176
Change-Id: I52b41275757b3b6ed9335412c00b2244c040298d
2024-03-20 05:01:16 +00:00