diff --git a/celadon_ivi/AndroidBoard.mk b/base_aaos/AndroidBoard.mk similarity index 98% rename from celadon_ivi/AndroidBoard.mk rename to base_aaos/AndroidBoard.mk index e4e145d29..76462b229 100644 --- a/celadon_ivi/AndroidBoard.mk +++ b/base_aaos/AndroidBoard.mk @@ -76,14 +76,14 @@ KF4UEFI := $(PRODUCT_OUT)/efi/kernelflinger.efi BOARD_FIRST_STAGE_LOADER := $(KF4UEFI) BOARD_EXTRA_EFI_MODULES := -#$(call flashfile_add_blob,capsule.fv,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/capsule.fv,,BOARD_SFU_UPDATE) -#$(call flashfile_add_blob,ifwi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/ifwi.bin,,EFI_IFWI_BIN) -#$(call flashfile_add_blob,ifwi_dnx.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/ifwi_dnx.bin,,EFI_IFWI_DNX_BIN) -#$(call flashfile_add_blob,firmware.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/emmc.bin,,EFI_EMMC_BIN) -#$(call flashfile_add_blob,afu.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/afu.bin,,EFI_AFU_BIN) -#$(call flashfile_add_blob,dnxp_0x1.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/dnxp_0x1.bin,,DNXP_BIN) -#$(call flashfile_add_blob,cfgpart.xml,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/cfgpart.xml,,CFGPART_XML) -#$(call flashfile_add_blob,cse_spi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/celadon_ivi/::variant::/$(BIOS_VARIANT)/cse_spi.bin,,CSE_SPI_BIN) +#$(call flashfile_add_blob,capsule.fv,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/capsule.fv,,BOARD_SFU_UPDATE) +#$(call flashfile_add_blob,ifwi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/ifwi.bin,,EFI_IFWI_BIN) +#$(call flashfile_add_blob,ifwi_dnx.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/ifwi_dnx.bin,,EFI_IFWI_DNX_BIN) +#$(call flashfile_add_blob,firmware.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/emmc.bin,,EFI_EMMC_BIN) +#$(call flashfile_add_blob,afu.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/afu.bin,,EFI_AFU_BIN) +#$(call flashfile_add_blob,dnxp_0x1.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/dnxp_0x1.bin,,DNXP_BIN) +#$(call flashfile_add_blob,cfgpart.xml,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/cfgpart.xml,,CFGPART_XML) +#$(call flashfile_add_blob,cse_spi.bin,$(INTEL_PATH_HARDWARE)/fw_capsules/base_aaos/::variant::/$(BIOS_VARIANT)/cse_spi.bin,,CSE_SPI_BIN) ifneq ($(EFI_IFWI_BIN),) @@ -536,7 +536,7 @@ AUTO_IN += $(TARGET_DEVICE_DIR)/extra_files/audio/auto_hal.in KERNEL_CAR_DIFFCONFIG = $(wildcard $(KERNEL_CONFIG_PATH)/car_diffconfig) KERNEL_DIFFCONFIG += $(KERNEL_CAR_DIFFCONFIG) ############################################################## -# Source: device/intel/mixins/groups/device-specific/celadon_ivi/AndroidBoard.mk +# Source: device/intel/mixins/groups/device-specific/base_aaos/AndroidBoard.mk ############################################################## KERNEL_APL_DIFFCONFIG = $(wildcard $(KERNEL_CONFIG_PATH)/apl_nuc_diffconfig) KERNEL_DIFFCONFIG += $(KERNEL_APL_DIFFCONFIG) diff --git a/celadon_ivi/BoardConfig.mk b/base_aaos/BoardConfig.mk similarity index 99% rename from celadon_ivi/BoardConfig.mk rename to base_aaos/BoardConfig.mk index b8d68991e..098192287 100644 --- a/celadon_ivi/BoardConfig.mk +++ b/base_aaos/BoardConfig.mk @@ -307,7 +307,7 @@ BOARD_SEPOLICY_DIRS += \ TARGET_USES_CAR_FUTURE_FEATURES := true BOARD_SEPOLICY_M4DEFS += module_carservice_app=true ############################################################## -# Source: device/intel/mixins/groups/device-specific/celadon_ivi/BoardConfig.mk +# Source: device/intel/mixins/groups/device-specific/base_aaos/BoardConfig.mk ############################################################## DEVICE_PACKAGE_OVERLAYS += ${TARGET_DEVICE_DIR}/overlay diff --git a/celadon_ivi/acpi/dummy.dtb b/base_aaos/acpi/dummy.dtb similarity index 100% rename from celadon_ivi/acpi/dummy.dtb rename to base_aaos/acpi/dummy.dtb diff --git a/celadon_ivi/audio/AndroidBoard.mk b/base_aaos/audio/AndroidBoard.mk similarity index 100% rename from celadon_ivi/audio/AndroidBoard.mk rename to base_aaos/audio/AndroidBoard.mk diff --git a/celadon_ivi/audio/default/AndroidBoard.mk b/base_aaos/audio/default/AndroidBoard.mk similarity index 100% rename from celadon_ivi/audio/default/AndroidBoard.mk rename to base_aaos/audio/default/AndroidBoard.mk diff --git a/celadon_ivi/audio/default/effect/audio_effects.xml b/base_aaos/audio/default/effect/audio_effects.xml similarity index 100% rename from celadon_ivi/audio/default/effect/audio_effects.xml rename to base_aaos/audio/default/effect/audio_effects.xml diff --git a/celadon_ivi/audio/default/mixer_paths_0.xml b/base_aaos/audio/default/mixer_paths_0.xml similarity index 100% rename from celadon_ivi/audio/default/mixer_paths_0.xml rename to base_aaos/audio/default/mixer_paths_0.xml diff --git a/celadon_ivi/audio/default/mixer_paths_ehl.xml b/base_aaos/audio/default/mixer_paths_ehl.xml similarity index 100% rename from celadon_ivi/audio/default/mixer_paths_ehl.xml rename to base_aaos/audio/default/mixer_paths_ehl.xml diff --git a/celadon_ivi/audio/default/mixer_paths_usb.xml b/base_aaos/audio/default/mixer_paths_usb.xml similarity index 100% rename from celadon_ivi/audio/default/mixer_paths_usb.xml rename to base_aaos/audio/default/mixer_paths_usb.xml diff --git a/celadon_ivi/audio/default/parameter-framework/AudioCriteria.txt b/base_aaos/audio/default/parameter-framework/AudioCriteria.txt similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/AudioCriteria.txt rename to base_aaos/audio/default/parameter-framework/AudioCriteria.txt diff --git a/celadon_ivi/audio/default/parameter-framework/AudioParameterFramework.xml b/base_aaos/audio/default/parameter-framework/AudioParameterFramework.xml similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/AudioParameterFramework.xml rename to base_aaos/audio/default/parameter-framework/AudioParameterFramework.xml diff --git a/celadon_ivi/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw b/base_aaos/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw rename to base_aaos/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw diff --git a/celadon_ivi/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw b/base_aaos/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw rename to base_aaos/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw diff --git a/celadon_ivi/audio/default/parameter-framework/Structure/Audio/AudioClass.xml b/base_aaos/audio/default/parameter-framework/Structure/Audio/AudioClass.xml similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/Structure/Audio/AudioClass.xml rename to base_aaos/audio/default/parameter-framework/Structure/Audio/AudioClass.xml diff --git a/celadon_ivi/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml b/base_aaos/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml rename to base_aaos/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml diff --git a/celadon_ivi/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml b/base_aaos/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml rename to base_aaos/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml diff --git a/celadon_ivi/audio/default/policy/a2dp_audio_policy_configuration.xml b/base_aaos/audio/default/policy/a2dp_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/a2dp_audio_policy_configuration.xml rename to base_aaos/audio/default/policy/a2dp_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/audio_policy_configuration.xml b/base_aaos/audio/default/policy/audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_configuration.xml rename to base_aaos/audio/default/policy/audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/audio_policy_criteria.conf b/base_aaos/audio/default/policy/audio_policy_criteria.conf similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_criteria.conf rename to base_aaos/audio/default/policy/audio_policy_criteria.conf diff --git a/celadon_ivi/audio/default/policy/audio_policy_engine_configuration.xml b/base_aaos/audio/default/policy/audio_policy_engine_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_engine_configuration.xml rename to base_aaos/audio/default/policy/audio_policy_engine_configuration.xml diff --git a/celadon_ivi/audio/default/policy/audio_policy_engine_criteria.xml b/base_aaos/audio/default/policy/audio_policy_engine_criteria.xml similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_engine_criteria.xml rename to base_aaos/audio/default/policy/audio_policy_engine_criteria.xml diff --git a/celadon_ivi/audio/default/policy/audio_policy_engine_criterion_types.xml.in b/base_aaos/audio/default/policy/audio_policy_engine_criterion_types.xml.in similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_engine_criterion_types.xml.in rename to base_aaos/audio/default/policy/audio_policy_engine_criterion_types.xml.in diff --git a/celadon_ivi/audio/default/policy/audio_policy_engine_product_strategies.xml b/base_aaos/audio/default/policy/audio_policy_engine_product_strategies.xml similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_engine_product_strategies.xml rename to base_aaos/audio/default/policy/audio_policy_engine_product_strategies.xml diff --git a/celadon_ivi/audio/default/policy/audio_policy_volumes.xml b/base_aaos/audio/default/policy/audio_policy_volumes.xml similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_volumes.xml rename to base_aaos/audio/default/policy/audio_policy_volumes.xml diff --git a/celadon_ivi/audio/default/policy/default_volume_tables.xml b/base_aaos/audio/default/policy/default_volume_tables.xml similarity index 100% rename from celadon_ivi/audio/default/policy/default_volume_tables.xml rename to base_aaos/audio/default/policy/default_volume_tables.xml diff --git a/celadon_ivi/audio/default/policy/fallback/audio_policy_configuration_generic.xml b/base_aaos/audio/default/policy/fallback/audio_policy_configuration_generic.xml similarity index 100% rename from celadon_ivi/audio/default/policy/fallback/audio_policy_configuration_generic.xml rename to base_aaos/audio/default/policy/fallback/audio_policy_configuration_generic.xml diff --git a/celadon_ivi/audio/default/policy/fallback/audio_policy_volumes.xml b/base_aaos/audio/default/policy/fallback/audio_policy_volumes.xml similarity index 100% rename from celadon_ivi/audio/default/policy/fallback/audio_policy_volumes.xml rename to base_aaos/audio/default/policy/fallback/audio_policy_volumes.xml diff --git a/celadon_ivi/audio/default/policy/fallback/default_volume_tables.xml b/base_aaos/audio/default/policy/fallback/default_volume_tables.xml similarity index 100% rename from celadon_ivi/audio/default/policy/fallback/default_volume_tables.xml rename to base_aaos/audio/default/policy/fallback/default_volume_tables.xml diff --git a/celadon_ivi/audio/default/policy/fallback/primary_audio_policy_configuration.xml b/base_aaos/audio/default/policy/fallback/primary_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/fallback/primary_audio_policy_configuration.xml rename to base_aaos/audio/default/policy/fallback/primary_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/fallback/r_submix_audio_policy_configuration.xml b/base_aaos/audio/default/policy/fallback/r_submix_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/fallback/r_submix_audio_policy_configuration.xml rename to base_aaos/audio/default/policy/fallback/r_submix_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/hdmi_audio_policy_configuration.xml b/base_aaos/audio/default/policy/hdmi_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/hdmi_audio_policy_configuration.xml rename to base_aaos/audio/default/policy/hdmi_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/r_submix_audio_policy_configuration.xml b/base_aaos/audio/default/policy/r_submix_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/r_submix_audio_policy_configuration.xml rename to base_aaos/audio/default/policy/r_submix_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/stub_audio_policy_configuration.xml b/base_aaos/audio/default/policy/stub_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/stub_audio_policy_configuration.xml rename to base_aaos/audio/default/policy/stub_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/usb_audio_policy_configuration.xml b/base_aaos/audio/default/policy/usb_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/usb_audio_policy_configuration.xml rename to base_aaos/audio/default/policy/usb_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/route/audio_criteria.xml b/base_aaos/audio/default/route/audio_criteria.xml similarity index 100% rename from celadon_ivi/audio/default/route/audio_criteria.xml rename to base_aaos/audio/default/route/audio_criteria.xml diff --git a/celadon_ivi/audio/default/route/audio_criterion_types.xml b/base_aaos/audio/default/route/audio_criterion_types.xml similarity index 100% rename from celadon_ivi/audio/default/route/audio_criterion_types.xml rename to base_aaos/audio/default/route/audio_criterion_types.xml diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/AndroidBoard.mk b/base_aaos/audio/reference_configurable_audio_policy/AndroidBoard.mk similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/AndroidBoard.mk rename to base_aaos/audio/reference_configurable_audio_policy/AndroidBoard.mk diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in b/base_aaos/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in rename to base_aaos/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/README.md b/base_aaos/audio/reference_configurable_audio_policy/README.md similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/README.md rename to base_aaos/audio/reference_configurable_audio_policy/README.md diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml b/base_aaos/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml rename to base_aaos/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/volumes.pfw b/base_aaos/audio/reference_configurable_audio_policy/Settings/volumes.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/volumes.pfw rename to base_aaos/audio/reference_configurable_audio_policy/Settings/volumes.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw b/base_aaos/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw rename to base_aaos/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw b/base_aaos/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw rename to base_aaos/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml b/base_aaos/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml rename to base_aaos/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml b/base_aaos/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml rename to base_aaos/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml b/base_aaos/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml rename to base_aaos/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/policy_criteria.txt b/base_aaos/audio/reference_configurable_audio_policy/policy_criteria.txt similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/policy_criteria.txt rename to base_aaos/audio/reference_configurable_audio_policy/policy_criteria.txt diff --git a/celadon_ivi/auto_switch_pt_usb_vms.sh b/base_aaos/auto_switch_pt_usb_vms.sh similarity index 100% rename from celadon_ivi/auto_switch_pt_usb_vms.sh rename to base_aaos/auto_switch_pt_usb_vms.sh diff --git a/celadon_ivi/bldr_utils.img b/base_aaos/bldr_utils.img similarity index 100% rename from celadon_ivi/bldr_utils.img rename to base_aaos/bldr_utils.img diff --git a/celadon_ivi/cam_sharing/0001-Netlink-sync.patch b/base_aaos/cam_sharing/0001-Netlink-sync.patch similarity index 100% rename from celadon_ivi/cam_sharing/0001-Netlink-sync.patch rename to base_aaos/cam_sharing/0001-Netlink-sync.patch diff --git a/celadon_ivi/cam_sharing/IntelCameraService b/base_aaos/cam_sharing/IntelCameraService similarity index 100% rename from celadon_ivi/cam_sharing/IntelCameraService rename to base_aaos/cam_sharing/IntelCameraService diff --git a/celadon_ivi/cam_sharing/virtualcamera.service b/base_aaos/cam_sharing/virtualcamera.service similarity index 100% rename from celadon_ivi/cam_sharing/virtualcamera.service rename to base_aaos/cam_sharing/virtualcamera.service diff --git a/celadon_ivi/check_lowmem.sh b/base_aaos/check_lowmem.sh similarity index 100% rename from celadon_ivi/check_lowmem.sh rename to base_aaos/check_lowmem.sh diff --git a/celadon_ivi/compatibility_matrix.xml b/base_aaos/compatibility_matrix.xml similarity index 100% rename from celadon_ivi/compatibility_matrix.xml rename to base_aaos/compatibility_matrix.xml diff --git a/celadon_ivi/config-lts/linux-intel-lts2021/caas_diffconfig b/base_aaos/config-lts/linux-intel-lts2021/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/linux-intel-lts2021/caas_diffconfig rename to base_aaos/config-lts/linux-intel-lts2021/caas_diffconfig diff --git a/celadon_ivi/config-lts/linux-intel-lts2021/debug_diffconfig b/base_aaos/config-lts/linux-intel-lts2021/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/linux-intel-lts2021/debug_diffconfig rename to base_aaos/config-lts/linux-intel-lts2021/debug_diffconfig diff --git a/celadon_ivi/config-lts/linux-intel-lts2021/x86_64_defconfig b/base_aaos/config-lts/linux-intel-lts2021/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/linux-intel-lts2021/x86_64_defconfig rename to base_aaos/config-lts/linux-intel-lts2021/x86_64_defconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/abl_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/abl_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/abl_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/abl_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/apl_nuc_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/apl_nuc_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/apl_nuc_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/apl_nuc_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/bxtp_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/bxtp_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/bxtp_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/bxtp_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/car_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/car_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/car_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/car_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/cbc_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/cbc_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/cbc_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/cbc_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/debug_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/debug_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/debug_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/eng_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/eng_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/eng_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/eng_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/modules_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/modules_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/modules_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/modules_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/sbl_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/sbl_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/sbl_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/sbl_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/ull_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/ull_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/ull_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/ull_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/vsbl_diffconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/vsbl_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/vsbl_diffconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/vsbl_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/base_aaos/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig rename to base_aaos/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig diff --git a/celadon_ivi/config-lts/lts2019-chromium/caas_diffconfig b/base_aaos/config-lts/lts2019-chromium/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-chromium/caas_diffconfig rename to base_aaos/config-lts/lts2019-chromium/caas_diffconfig diff --git a/celadon_ivi/config-lts/lts2019-chromium/cfc_diffconfig b/base_aaos/config-lts/lts2019-chromium/cfc_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-chromium/cfc_diffconfig rename to base_aaos/config-lts/lts2019-chromium/cfc_diffconfig diff --git a/celadon_ivi/config-lts/lts2019-chromium/debug_diffconfig b/base_aaos/config-lts/lts2019-chromium/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-chromium/debug_diffconfig rename to base_aaos/config-lts/lts2019-chromium/debug_diffconfig diff --git a/celadon_ivi/config-lts/lts2019-chromium/x86_64_defconfig b/base_aaos/config-lts/lts2019-chromium/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-chromium/x86_64_defconfig rename to base_aaos/config-lts/lts2019-chromium/x86_64_defconfig diff --git a/celadon_ivi/config-lts/lts2019-yocto/caas_diffconfig b/base_aaos/config-lts/lts2019-yocto/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-yocto/caas_diffconfig rename to base_aaos/config-lts/lts2019-yocto/caas_diffconfig diff --git a/celadon_ivi/config-lts/lts2019-yocto/debug_diffconfig b/base_aaos/config-lts/lts2019-yocto/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-yocto/debug_diffconfig rename to base_aaos/config-lts/lts2019-yocto/debug_diffconfig diff --git a/celadon_ivi/config-lts/lts2019-yocto/x86_64_defconfig b/base_aaos/config-lts/lts2019-yocto/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-yocto/x86_64_defconfig rename to base_aaos/config-lts/lts2019-yocto/x86_64_defconfig diff --git a/celadon_ivi/config-lts/lts2020-chromium/caas_diffconfig b/base_aaos/config-lts/lts2020-chromium/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-chromium/caas_diffconfig rename to base_aaos/config-lts/lts2020-chromium/caas_diffconfig diff --git a/celadon_ivi/config-lts/lts2020-chromium/debug_diffconfig b/base_aaos/config-lts/lts2020-chromium/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-chromium/debug_diffconfig rename to base_aaos/config-lts/lts2020-chromium/debug_diffconfig diff --git a/celadon_ivi/config-lts/lts2020-chromium/x86_64_defconfig b/base_aaos/config-lts/lts2020-chromium/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-chromium/x86_64_defconfig rename to base_aaos/config-lts/lts2020-chromium/x86_64_defconfig diff --git a/celadon_ivi/config-lts/lts2020-yocto/caas_diffconfig b/base_aaos/config-lts/lts2020-yocto/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-yocto/caas_diffconfig rename to base_aaos/config-lts/lts2020-yocto/caas_diffconfig diff --git a/celadon_ivi/config-lts/lts2020-yocto/debug_diffconfig b/base_aaos/config-lts/lts2020-yocto/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-yocto/debug_diffconfig rename to base_aaos/config-lts/lts2020-yocto/debug_diffconfig diff --git a/celadon_ivi/config-lts/lts2020-yocto/x86_64_defconfig b/base_aaos/config-lts/lts2020-yocto/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-yocto/x86_64_defconfig rename to base_aaos/config-lts/lts2020-yocto/x86_64_defconfig diff --git a/celadon_ivi/device.mk b/base_aaos/device.mk similarity index 99% rename from celadon_ivi/device.mk rename to base_aaos/device.mk index ae1fe375e..bdda89772 100644 --- a/celadon_ivi/device.mk +++ b/base_aaos/device.mk @@ -291,7 +291,7 @@ PRODUCT_PACKAGES += android.hardware.automotive.vehicle@2.0-service \ VEHICLE_HAL_PROTO_TYPE := google-emulator ############################################################## -# Source: device/intel/mixins/groups/device-specific/celadon_ivi/product.mk +# Source: device/intel/mixins/groups/device-specific/base_aaos/product.mk ############################################################## TARGET_BOARD_PLATFORM := celadon diff --git a/celadon_ivi/display_settings.xml b/base_aaos/display_settings.xml similarity index 100% rename from celadon_ivi/display_settings.xml rename to base_aaos/display_settings.xml diff --git a/celadon_ivi/extra_files/abota-fw/update_ifwi_ab.sh b/base_aaos/extra_files/abota-fw/update_ifwi_ab.sh similarity index 100% rename from celadon_ivi/extra_files/abota-fw/update_ifwi_ab.sh rename to base_aaos/extra_files/abota-fw/update_ifwi_ab.sh diff --git a/celadon_ivi/extra_files/abota-fw/update_ifwi_boot.sh b/base_aaos/extra_files/abota-fw/update_ifwi_boot.sh similarity index 100% rename from celadon_ivi/extra_files/abota-fw/update_ifwi_boot.sh rename to base_aaos/extra_files/abota-fw/update_ifwi_boot.sh diff --git a/celadon_ivi/extra_files/abota-fw/upgrade_o/fw_update.sh b/base_aaos/extra_files/abota-fw/upgrade_o/fw_update.sh similarity index 100% rename from celadon_ivi/extra_files/abota-fw/upgrade_o/fw_update.sh rename to base_aaos/extra_files/abota-fw/upgrade_o/fw_update.sh diff --git a/celadon_ivi/extra_files/abota-fw/upgrade_o/updater_ab.sh b/base_aaos/extra_files/abota-fw/upgrade_o/updater_ab.sh similarity index 100% rename from celadon_ivi/extra_files/abota-fw/upgrade_o/updater_ab.sh rename to base_aaos/extra_files/abota-fw/upgrade_o/updater_ab.sh diff --git a/celadon_ivi/extra_files/acpio-partition/dummy-ssdt.asl b/base_aaos/extra_files/acpio-partition/dummy-ssdt.asl similarity index 100% rename from celadon_ivi/extra_files/acpio-partition/dummy-ssdt.asl rename to base_aaos/extra_files/acpio-partition/dummy-ssdt.asl diff --git a/celadon_ivi/extra_files/audio/auto_hal.in b/base_aaos/extra_files/audio/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/audio/auto_hal.in rename to base_aaos/extra_files/audio/auto_hal.in diff --git a/celadon_ivi/extra_files/avx/checkavx.sh b/base_aaos/extra_files/avx/checkavx.sh similarity index 100% rename from celadon_ivi/extra_files/avx/checkavx.sh rename to base_aaos/extra_files/avx/checkavx.sh diff --git a/celadon_ivi/extra_files/boot-arch/set_soc_prop.sh b/base_aaos/extra_files/boot-arch/set_soc_prop.sh similarity index 100% rename from celadon_ivi/extra_files/boot-arch/set_soc_prop.sh rename to base_aaos/extra_files/boot-arch/set_soc_prop.sh diff --git a/celadon_ivi/extra_files/boot-arch/startup.nsh b/base_aaos/extra_files/boot-arch/startup.nsh similarity index 100% rename from celadon_ivi/extra_files/boot-arch/startup.nsh rename to base_aaos/extra_files/boot-arch/startup.nsh diff --git a/celadon_ivi/extra_files/boot-arch/update_ifwi_ab.sh b/base_aaos/extra_files/boot-arch/update_ifwi_ab.sh similarity index 100% rename from celadon_ivi/extra_files/boot-arch/update_ifwi_ab.sh rename to base_aaos/extra_files/boot-arch/update_ifwi_ab.sh diff --git a/celadon_ivi/extra_files/camera-ext/external_camera_config.xml b/base_aaos/extra_files/camera-ext/external_camera_config.xml similarity index 100% rename from celadon_ivi/extra_files/camera-ext/external_camera_config.xml rename to base_aaos/extra_files/camera-ext/external_camera_config.xml diff --git a/celadon_ivi/extra_files/codec2/media_codecs_c2.xml b/base_aaos/extra_files/codec2/media_codecs_c2.xml similarity index 100% rename from celadon_ivi/extra_files/codec2/media_codecs_c2.xml rename to base_aaos/extra_files/codec2/media_codecs_c2.xml diff --git a/celadon_ivi/extra_files/codec2/media_codecs_intel_c2_video.xml b/base_aaos/extra_files/codec2/media_codecs_intel_c2_video.xml similarity index 100% rename from celadon_ivi/extra_files/codec2/media_codecs_intel_c2_video.xml rename to base_aaos/extra_files/codec2/media_codecs_intel_c2_video.xml diff --git a/celadon_ivi/extra_files/codec2/media_codecs_performance_c2_adl.xml b/base_aaos/extra_files/codec2/media_codecs_performance_c2_adl.xml similarity index 100% rename from celadon_ivi/extra_files/codec2/media_codecs_performance_c2_adl.xml rename to base_aaos/extra_files/codec2/media_codecs_performance_c2_adl.xml diff --git a/celadon_ivi/extra_files/codec2/media_codecs_performance_c2_tgl.xml b/base_aaos/extra_files/codec2/media_codecs_performance_c2_tgl.xml similarity index 100% rename from celadon_ivi/extra_files/codec2/media_codecs_performance_c2_tgl.xml rename to base_aaos/extra_files/codec2/media_codecs_performance_c2_tgl.xml diff --git a/celadon_ivi/extra_files/codec2/mfx_c2_store.conf b/base_aaos/extra_files/codec2/mfx_c2_store.conf similarity index 100% rename from celadon_ivi/extra_files/codec2/mfx_c2_store.conf rename to base_aaos/extra_files/codec2/mfx_c2_store.conf diff --git a/celadon_ivi/extra_files/codecs/auto_hal.in b/base_aaos/extra_files/codecs/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/codecs/auto_hal.in rename to base_aaos/extra_files/codecs/auto_hal.in diff --git a/celadon_ivi/extra_files/codecs/media_codecs_gen12.xml b/base_aaos/extra_files/codecs/media_codecs_gen12.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_gen12.xml rename to base_aaos/extra_files/codecs/media_codecs_gen12.xml diff --git a/celadon_ivi/extra_files/codecs/media_codecs_gen9.xml b/base_aaos/extra_files/codecs/media_codecs_gen9.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_gen9.xml rename to base_aaos/extra_files/codecs/media_codecs_gen9.xml diff --git a/celadon_ivi/extra_files/codecs/media_codecs_performance_adl.xml b/base_aaos/extra_files/codecs/media_codecs_performance_adl.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_performance_adl.xml rename to base_aaos/extra_files/codecs/media_codecs_performance_adl.xml diff --git a/celadon_ivi/extra_files/codecs/media_codecs_performance_cml.xml b/base_aaos/extra_files/codecs/media_codecs_performance_cml.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_performance_cml.xml rename to base_aaos/extra_files/codecs/media_codecs_performance_cml.xml diff --git a/celadon_ivi/extra_files/codecs/media_codecs_performance_tgl.xml b/base_aaos/extra_files/codecs/media_codecs_performance_tgl.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_performance_tgl.xml rename to base_aaos/extra_files/codecs/media_codecs_performance_tgl.xml diff --git a/celadon_ivi/extra_files/codecs/media_codecs_vp9.xml b/base_aaos/extra_files/codecs/media_codecs_vp9.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_vp9.xml rename to base_aaos/extra_files/codecs/media_codecs_vp9.xml diff --git a/celadon_ivi/extra_files/codecs/media_profiles.xml b/base_aaos/extra_files/codecs/media_profiles.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_profiles.xml rename to base_aaos/extra_files/codecs/media_profiles.xml diff --git a/celadon_ivi/extra_files/codecs/media_profiles_1080p.xml b/base_aaos/extra_files/codecs/media_profiles_1080p.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_profiles_1080p.xml rename to base_aaos/extra_files/codecs/media_profiles_1080p.xml diff --git a/celadon_ivi/extra_files/codecs/mfx_omxil_core.conf b/base_aaos/extra_files/codecs/mfx_omxil_core.conf similarity index 100% rename from celadon_ivi/extra_files/codecs/mfx_omxil_core.conf rename to base_aaos/extra_files/codecs/mfx_omxil_core.conf diff --git a/celadon_ivi/extra_files/codecs/mfx_omxil_core_vp9.conf b/base_aaos/extra_files/codecs/mfx_omxil_core_vp9.conf similarity index 100% rename from celadon_ivi/extra_files/codecs/mfx_omxil_core_vp9.conf rename to base_aaos/extra_files/codecs/mfx_omxil_core_vp9.conf diff --git a/celadon_ivi/extra_files/debug-crashlogd/init.crashlogd.rc b/base_aaos/extra_files/debug-crashlogd/init.crashlogd.rc similarity index 100% rename from celadon_ivi/extra_files/debug-crashlogd/init.crashlogd.rc rename to base_aaos/extra_files/debug-crashlogd/init.crashlogd.rc diff --git a/celadon_ivi/extra_files/docker/99-ignore-keyboard.rules b/base_aaos/extra_files/docker/99-ignore-keyboard.rules similarity index 100% rename from celadon_ivi/extra_files/docker/99-ignore-keyboard.rules rename to base_aaos/extra_files/docker/99-ignore-keyboard.rules diff --git a/celadon_ivi/extra_files/docker/99-ignore-mouse.rules b/base_aaos/extra_files/docker/99-ignore-mouse.rules similarity index 100% rename from celadon_ivi/extra_files/docker/99-ignore-mouse.rules rename to base_aaos/extra_files/docker/99-ignore-mouse.rules diff --git a/celadon_ivi/extra_files/docker/config.toml b/base_aaos/extra_files/docker/config.toml similarity index 100% rename from celadon_ivi/extra_files/docker/config.toml rename to base_aaos/extra_files/docker/config.toml diff --git a/celadon_ivi/extra_files/docker/containerd b/base_aaos/extra_files/docker/containerd similarity index 100% rename from celadon_ivi/extra_files/docker/containerd rename to base_aaos/extra_files/docker/containerd diff --git a/celadon_ivi/extra_files/docker/containerd-shim-runc-v2 b/base_aaos/extra_files/docker/containerd-shim-runc-v2 similarity index 100% rename from celadon_ivi/extra_files/docker/containerd-shim-runc-v2 rename to base_aaos/extra_files/docker/containerd-shim-runc-v2 diff --git a/celadon_ivi/extra_files/docker/daemon.json b/base_aaos/extra_files/docker/daemon.json similarity index 100% rename from celadon_ivi/extra_files/docker/daemon.json rename to base_aaos/extra_files/docker/daemon.json diff --git a/celadon_ivi/extra_files/docker/docker b/base_aaos/extra_files/docker/docker similarity index 100% rename from celadon_ivi/extra_files/docker/docker rename to base_aaos/extra_files/docker/docker diff --git a/celadon_ivi/extra_files/docker/docker_manager b/base_aaos/extra_files/docker/docker_manager similarity index 100% rename from celadon_ivi/extra_files/docker/docker_manager rename to base_aaos/extra_files/docker/docker_manager diff --git a/celadon_ivi/extra_files/docker/dockerd b/base_aaos/extra_files/docker/dockerd similarity index 100% rename from celadon_ivi/extra_files/docker/dockerd rename to base_aaos/extra_files/docker/dockerd diff --git a/celadon_ivi/extra_files/docker/dockerd-dev b/base_aaos/extra_files/docker/dockerd-dev similarity index 100% rename from celadon_ivi/extra_files/docker/dockerd-dev rename to base_aaos/extra_files/docker/dockerd-dev diff --git a/celadon_ivi/extra_files/docker/lic_install.sh b/base_aaos/extra_files/docker/lic_install.sh similarity index 100% rename from celadon_ivi/extra_files/docker/lic_install.sh rename to base_aaos/extra_files/docker/lic_install.sh diff --git a/celadon_ivi/extra_files/docker/runc b/base_aaos/extra_files/docker/runc similarity index 100% rename from celadon_ivi/extra_files/docker/runc rename to base_aaos/extra_files/docker/runc diff --git a/celadon_ivi/extra_files/ethernet/load_eth_modules.in b/base_aaos/extra_files/ethernet/load_eth_modules.in similarity index 100% rename from celadon_ivi/extra_files/ethernet/load_eth_modules.in rename to base_aaos/extra_files/ethernet/load_eth_modules.in diff --git a/celadon_ivi/extra_files/firststage-mount/config.asl b/base_aaos/extra_files/firststage-mount/config.asl similarity index 100% rename from celadon_ivi/extra_files/firststage-mount/config.asl rename to base_aaos/extra_files/firststage-mount/config.asl diff --git a/celadon_ivi/extra_files/graphics/auto_hal.in b/base_aaos/extra_files/graphics/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/graphics/auto_hal.in rename to base_aaos/extra_files/graphics/auto_hal.in diff --git a/celadon_ivi/extra_files/graphics/drirc b/base_aaos/extra_files/graphics/drirc similarity index 100% rename from celadon_ivi/extra_files/graphics/drirc rename to base_aaos/extra_files/graphics/drirc diff --git a/celadon_ivi/extra_files/intel_prop/intel_prop.cfg b/base_aaos/extra_files/intel_prop/intel_prop.cfg similarity index 100% rename from celadon_ivi/extra_files/intel_prop/intel_prop.cfg rename to base_aaos/extra_files/intel_prop/intel_prop.cfg diff --git a/celadon_ivi/extra_files/kernel/load_kernel_modules.in b/base_aaos/extra_files/kernel/load_kernel_modules.in similarity index 100% rename from celadon_ivi/extra_files/kernel/load_kernel_modules.in rename to base_aaos/extra_files/kernel/load_kernel_modules.in diff --git a/celadon_ivi/extra_files/media/auto_hal.in b/base_aaos/extra_files/media/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/media/auto_hal.in rename to base_aaos/extra_files/media/auto_hal.in diff --git a/celadon_ivi/extra_files/neuralnetworks/plugins.xml b/base_aaos/extra_files/neuralnetworks/plugins.xml similarity index 100% rename from celadon_ivi/extra_files/neuralnetworks/plugins.xml rename to base_aaos/extra_files/neuralnetworks/plugins.xml diff --git a/celadon_ivi/extra_files/power/auto_hal.in b/base_aaos/extra_files/power/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/power/auto_hal.in rename to base_aaos/extra_files/power/auto_hal.in diff --git a/celadon_ivi/extra_files/public-libraries/public.libraries.txt b/base_aaos/extra_files/public-libraries/public.libraries.txt similarity index 100% rename from celadon_ivi/extra_files/public-libraries/public.libraries.txt rename to base_aaos/extra_files/public-libraries/public.libraries.txt diff --git a/celadon_ivi/extra_files/sensors/auto_hal.in b/base_aaos/extra_files/sensors/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/sensors/auto_hal.in rename to base_aaos/extra_files/sensors/auto_hal.in diff --git a/celadon_ivi/extra_files/slot-ab/postinstall.sh b/base_aaos/extra_files/slot-ab/postinstall.sh similarity index 100% rename from celadon_ivi/extra_files/slot-ab/postinstall.sh rename to base_aaos/extra_files/slot-ab/postinstall.sh diff --git a/celadon_ivi/extra_files/suspend/auto_hal.in b/base_aaos/extra_files/suspend/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/suspend/auto_hal.in rename to base_aaos/extra_files/suspend/auto_hal.in diff --git a/celadon_ivi/extra_files/thermal/auto_hal.in b/base_aaos/extra_files/thermal/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/thermal/auto_hal.in rename to base_aaos/extra_files/thermal/auto_hal.in diff --git a/celadon_ivi/extra_files/usb-gadget/auto_hal.in b/base_aaos/extra_files/usb-gadget/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/usb-gadget/auto_hal.in rename to base_aaos/extra_files/usb-gadget/auto_hal.in diff --git a/celadon_ivi/extra_files/usb-init/load_usb_modules.in b/base_aaos/extra_files/usb-init/load_usb_modules.in similarity index 100% rename from celadon_ivi/extra_files/usb-init/load_usb_modules.in rename to base_aaos/extra_files/usb-init/load_usb_modules.in diff --git a/celadon_ivi/extra_files/usb-otg-switch/usb_otg_switch.sh b/base_aaos/extra_files/usb-otg-switch/usb_otg_switch.sh similarity index 100% rename from celadon_ivi/extra_files/usb-otg-switch/usb_otg_switch.sh rename to base_aaos/extra_files/usb-otg-switch/usb_otg_switch.sh diff --git a/celadon_ivi/extra_files/vendor-partition/mkshrc_recovery b/base_aaos/extra_files/vendor-partition/mkshrc_recovery similarity index 100% rename from celadon_ivi/extra_files/vendor-partition/mkshrc_recovery rename to base_aaos/extra_files/vendor-partition/mkshrc_recovery diff --git a/celadon_ivi/extra_files/vendor-partition/sh_recovery b/base_aaos/extra_files/vendor-partition/sh_recovery similarity index 100% rename from celadon_ivi/extra_files/vendor-partition/sh_recovery rename to base_aaos/extra_files/vendor-partition/sh_recovery diff --git a/celadon_ivi/extra_files/vendor-partition/toolbox_recovery b/base_aaos/extra_files/vendor-partition/toolbox_recovery similarity index 100% rename from celadon_ivi/extra_files/vendor-partition/toolbox_recovery rename to base_aaos/extra_files/vendor-partition/toolbox_recovery diff --git a/celadon_ivi/file_share.sh b/base_aaos/file_share.sh similarity index 100% rename from celadon_ivi/file_share.sh rename to base_aaos/file_share.sh diff --git a/celadon_ivi/findall.py b/base_aaos/findall.py similarity index 100% rename from celadon_ivi/findall.py rename to base_aaos/findall.py diff --git a/celadon_ivi/flash_cmd.sh b/base_aaos/flash_cmd.sh similarity index 100% rename from celadon_ivi/flash_cmd.sh rename to base_aaos/flash_cmd.sh diff --git a/celadon_ivi/flashfiles.ini b/base_aaos/flashfiles.ini similarity index 99% rename from celadon_ivi/flashfiles.ini rename to base_aaos/flashfiles.ini index ce1f2c5b4..a968e3094 100644 --- a/celadon_ivi/flashfiles.ini +++ b/base_aaos/flashfiles.ini @@ -48,7 +48,7 @@ description = Erase teedata partition ############################################################## -# Source: device/intel/mixins/groups/device-specific/celadon_ivi/flashfiles.ini +# Source: device/intel/mixins/groups/device-specific/base_aaos/flashfiles.ini ############################################################## [global] [command.unlock.unlock] diff --git a/celadon_ivi/framework_manifest.xml b/base_aaos/framework_manifest.xml similarity index 100% rename from celadon_ivi/framework_manifest.xml rename to base_aaos/framework_manifest.xml diff --git a/celadon_ivi/fstab b/base_aaos/fstab similarity index 100% rename from celadon_ivi/fstab rename to base_aaos/fstab diff --git a/celadon_ivi/fstab.recovery b/base_aaos/fstab.recovery similarity index 100% rename from celadon_ivi/fstab.recovery rename to base_aaos/fstab.recovery diff --git a/celadon_ivi/gpt.ini b/base_aaos/gpt.ini similarity index 100% rename from celadon_ivi/gpt.ini rename to base_aaos/gpt.ini diff --git a/celadon_ivi/guest_pm_control b/base_aaos/guest_pm_control similarity index 100% rename from celadon_ivi/guest_pm_control rename to base_aaos/guest_pm_control diff --git a/celadon_ivi/init.rc b/base_aaos/init.rc similarity index 99% rename from celadon_ivi/init.rc rename to base_aaos/init.rc index 873cc8e28..40448f6e6 100644 --- a/celadon_ivi/init.rc +++ b/base_aaos/init.rc @@ -209,7 +209,7 @@ on property:sys.boot_completed=1 && property:ro.vendor.hdmi.audio=tgl on property:sys.boot_completed=1 setprop vendor.boot_completed 1 ############################################################## -# Source: device/intel/mixins/groups/device-specific/celadon_ivi/init.rc +# Source: device/intel/mixins/groups/device-specific/base_aaos/init.rc ############################################################## on post-fs-data mkdir /data/kpanic 0770 system system diff --git a/celadon_ivi/init.recovery.rc b/base_aaos/init.recovery.rc similarity index 98% rename from celadon_ivi/init.recovery.rc rename to base_aaos/init.recovery.rc index 7e61de10b..2a0479257 100644 --- a/celadon_ivi/init.recovery.rc +++ b/base_aaos/init.recovery.rc @@ -21,7 +21,7 @@ on boot start watchdogd write /proc/sys/kernel/hung_task_timeout_secs 120 ############################################################## -# Source: device/intel/mixins/groups/device-specific/celadon_ivi/init.recovery.rc +# Source: device/intel/mixins/groups/device-specific/base_aaos/init.recovery.rc ############################################################## on post-fs wait /dev/graphics/fb0 diff --git a/celadon_ivi/intel-thermal-conf.xml b/base_aaos/intel-thermal-conf.xml similarity index 100% rename from celadon_ivi/intel-thermal-conf.xml rename to base_aaos/intel-thermal-conf.xml diff --git a/celadon_ivi/manifest.xml b/base_aaos/manifest.xml similarity index 100% rename from celadon_ivi/manifest.xml rename to base_aaos/manifest.xml diff --git a/celadon_ivi/mixins.spec b/base_aaos/mixins.spec similarity index 94% rename from celadon_ivi/mixins.spec rename to base_aaos/mixins.spec index 4fcaf8fb3..2e40223af 100755 --- a/celadon_ivi/mixins.spec +++ b/base_aaos/mixins.spec @@ -9,7 +9,7 @@ product.mk: device.mk [groups] kernel: gmin64(useprebuilt=false,src_path=kernel/linux-intel-lts2021, loglevel=7, interactive_governor=false, relative_sleepstates=false, modules_in_bootimg=false, external_modules=,debug_modules=, use_bcmdhd=false, use_iwlwifi=false, extmod_platform=bxt, iwl_defconfig=, cfg_path=config-lts/linux-intel-lts2021, more_modules=true, chromium_src_path=kernel/lts2019-chromium, chromium_cfg_path=config-lts/lts2019-chromium, lts2020_yocto_src_path=kernel/lts2020-yocto, lts2020_yocto_cfg_path=config-lts/lts2020-yocto, lts2020_chromium_src_path=kernel/lts2020-chromium, lts2020_chromium_cfg_path=config-lts/lts2020-chromium, linux_intel_lts2021_src_path=kernel/linux-intel-lts2021, linux_intel_lts2021_cfg_path=config-lts/linux-intel-lts2021) disk-bus: auto -boot-arch: project-celadon(fw_sbl=true,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,metadata_encryption=true,fsverity=true,target=celadon_ivi,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true,userdata_checkpoint=true) +boot-arch: project-celadon(fw_sbl=true,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,metadata_encryption=true,fsverity=true,target=base_aaos,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true,userdata_checkpoint=true) sepolicy: enforcing bluetooth: btusb(ivi=false) audio: project-celadon(ivi=true) @@ -66,7 +66,7 @@ usb-audio-init: false usb-otg-switch: true vndk: true public-libraries: true -device-specific: celadon_ivi +device-specific: base_aaos hdcpd: true treble: true swap: zram_auto(size=1073741824,swappiness=true,hardware=gordon_peak,disk_based_swap=true) diff --git a/celadon_ivi/celadon_ivi.mk b/base_aaos/oneandroidbase_aaos.mk similarity index 97% rename from celadon_ivi/celadon_ivi.mk rename to base_aaos/oneandroidbase_aaos.mk index 9ac25d83c..199cffbd7 100644 --- a/celadon_ivi/celadon_ivi.mk +++ b/base_aaos/oneandroidbase_aaos.mk @@ -47,8 +47,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(LOCAL_PATH)/device.mk) -PRODUCT_NAME := celadon_ivi -PRODUCT_DEVICE := celadon_ivi +PRODUCT_NAME := base_aaos +PRODUCT_DEVICE := base_aaos PRODUCT_BRAND := intel PRODUCT_MODEL := AOSP on Intel Platform PRODUCT_MANUFACTURER := Intel diff --git a/celadon_ivi/overlay/frameworks/base/core/res/res/values/config.xml b/base_aaos/overlay/frameworks/base/core/res/res/values/config.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/core/res/res/values/config.xml rename to base_aaos/overlay/frameworks/base/core/res/res/values/config.xml diff --git a/celadon_ivi/overlay/frameworks/base/core/res/res/values/strings.xml b/base_aaos/overlay/frameworks/base/core/res/res/values/strings.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/core/res/res/values/strings.xml rename to base_aaos/overlay/frameworks/base/core/res/res/values/strings.xml diff --git a/celadon_ivi/overlay/frameworks/base/core/res/res/values/symbols.xml b/base_aaos/overlay/frameworks/base/core/res/res/values/symbols.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/core/res/res/values/symbols.xml rename to base_aaos/overlay/frameworks/base/core/res/res/values/symbols.xml diff --git a/celadon_ivi/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/base_aaos/overlay/frameworks/base/core/res/res/xml/power_profile.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/core/res/res/xml/power_profile.xml rename to base_aaos/overlay/frameworks/base/core/res/res/xml/power_profile.xml diff --git a/celadon_ivi/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/base_aaos/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml rename to base_aaos/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml diff --git a/celadon_ivi/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/base_aaos/overlay/frameworks/base/packages/SystemUI/res/values/config.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/packages/SystemUI/res/values/config.xml rename to base_aaos/overlay/frameworks/base/packages/SystemUI/res/values/config.xml diff --git a/celadon_ivi/overlay/packages/apps/Bluetooth/res/values/config.xml b/base_aaos/overlay/packages/apps/Bluetooth/res/values/config.xml similarity index 100% rename from celadon_ivi/overlay/packages/apps/Bluetooth/res/values/config.xml rename to base_aaos/overlay/packages/apps/Bluetooth/res/values/config.xml diff --git a/celadon_ivi/setup_audio_host.sh b/base_aaos/setup_audio_host.sh similarity index 100% rename from celadon_ivi/setup_audio_host.sh rename to base_aaos/setup_audio_host.sh diff --git a/celadon_ivi/sof_audio/configure_sof.sh b/base_aaos/sof_audio/configure_sof.sh similarity index 100% rename from celadon_ivi/sof_audio/configure_sof.sh rename to base_aaos/sof_audio/configure_sof.sh diff --git a/celadon_ivi/system.prop b/base_aaos/system.prop similarity index 89% rename from celadon_ivi/system.prop rename to base_aaos/system.prop index ffca284eb..bf709f5a5 100644 --- a/celadon_ivi/system.prop +++ b/base_aaos/system.prop @@ -1,5 +1,5 @@ # -# system.prop for celadon_ivi +# system.prop for base_aaos # persist.sys.enable_rescue=false diff --git a/celadon_ivi/thermald.service b/base_aaos/thermald.service similarity index 100% rename from celadon_ivi/thermald.service rename to base_aaos/thermald.service diff --git a/celadon_ivi/ueventd.rc b/base_aaos/ueventd.rc similarity index 98% rename from celadon_ivi/ueventd.rc rename to base_aaos/ueventd.rc index 46c815c96..6a9c6fba1 100644 --- a/celadon_ivi/ueventd.rc +++ b/base_aaos/ueventd.rc @@ -18,7 +18,7 @@ /dev/rfkill 0660 root bluetooth /dev/bus/usb/00*/00* 0660 bluetooth bluetooth ############################################################## -# Source: device/intel/mixins/groups/device-specific/celadon_ivi/ueventd.rc +# Source: device/intel/mixins/groups/device-specific/base_aaos/ueventd.rc ############################################################## # FIXME: move these mei definitions to a mix-in diff --git a/celadon_ivi/wakeup.py b/base_aaos/wakeup.py similarity index 100% rename from celadon_ivi/wakeup.py rename to base_aaos/wakeup.py