Commit graph

2 commits

Author SHA1 Message Date
Nelson Li
33473b8486 Convert p24_common/preloaded_nanoapps.json's .mk file to Android.bp.
p24_common includes 5 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/27080050, ag/27081111, ag/27095942, ag/27095945
ag/27095945, ag/27138057, ag/27138236, 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: 336452008
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: I44832b1862da9c000a7baf20ea9d6e4874ed9c54
2024-04-30 07:52:12 +00:00
Nelson Li
f5c81992db Refactor product inheritance for tokay products
Add an additional layer of inheritance for `factory_tokay`,
`aosp_tokay`, and `aosp_tokay_fullmte`.

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

Non-factory `tokay` products now inherits from
`device/google/caimito/tokay_generic.mk` which inherit from
`device/google/caimito/device-tokay.mk`.

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

Bug: 336452008
Bug: 336706866
Test: lunch aosp_tokay-trunk_staging-userdebug && m
      lunch aosp_tokay_fullmte-trunk_staging-userdebug && m

Change-Id: Ided24b5d180bcfdf8ff2b1f9964fa42c0c53ef99
2024-04-29 02:06:29 +00:00