Commit graph

2 commits

Author SHA1 Message Date
Nelson Li
a01a9b8e49 Convert comet/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/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: I80204d2868b209273eb7d696ad8359c9d7a26c05
2024-04-30 07:59:56 +00:00
Nelson Li
7b45c49c65 Refactor product inheritance for comet products
Add an additional layer of inheritance for `aosp_comet`.

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

Non-factory `comet` products now inherits from
`device/google/comet/comet_generic.mk` which inherit from
`device/google/comet/device-comet.mk`.

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

Bug: 336452008
Bug: 336707612
Test: lunch aosp_comet-trunk_staging-userdebug && m
Change-Id: I22306fbe0eadc217d61a19ebd163265f9d0f12a0
2024-04-29 02:57:55 +00:00