Commit graph

2 commits

Author SHA1 Message Date
Nelson Li
1223265afb Convert p23_common/preloaded_nanoapps.json's .mk file to Android.bp.
p23_common includes 4 devices.

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/27008138, ag/27046793, ag/27008143, and
ag/27056982, 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: 332219400
Test: 1. lunch <device_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: Ife53dddd3469de8eacb6d862bc1b8d9de3ce427e
2024-04-26 06:31:30 +00:00
Nelson Li
71e02ec7d9 Refactor product inheritance for ripcurrent products
Add an additional layer of inheritance for `aosp_ripcurrent` and
`aosp_ripcurrent`.

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

non-factory `ripcurrent` products now inherits from
`device/google/shusky/ripcurrent_generic.mk` which inherit from
`device/google/shusky/device-ripcurrent.mk`.

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

Bug: 332219400
Bug: 335564645
Test: lunch factory_ripcurrent-trunk_staging-userdebug && m
      lunch aosp_ripcurrent-trunk_staging-userdebug && m
      lunch aosp_ripcurrent_fullmte-trunk_staging-userdebug && m
Change-Id: Ieb552a075e35215cb027b6d5a91d84168d9e6a45
2024-04-26 01:09:20 +00:00