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
20 lines
771 B
Makefile
20 lines
771 B
Makefile
#
|
|
# Copyright 2024 The Android Open-Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
$(call inherit-product, device/google/caimito/device-ripcurrentpro.mk)
|
|
|
|
# preloaded_nanoapps.json
|
|
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common
|