Commit graph

2 commits

Author SHA1 Message Date
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
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