Commit graph

2 commits

Author SHA1 Message Date
Nelson Li
1413e4537f Convert raven/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/27170563, 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: 338005353
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: Ie4551fc30c75a401a615a729e651949696117352
2024-05-07 00:51:58 +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