From 2ad5924513c87409f53b2b0cdc056ff6a97fa86d Mon Sep 17 00:00:00 2001 From: jschung Date: Sun, 06 Apr 2025 16:13:20 +0900 Subject: [PATCH] Add source.properties to generic car system image Define car emulator specific source.properties to avoid an empty value for PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP. Bug: 404958322 Test: get_build_var PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f486bc40cbec86018c7da97e96b0841aa1bf6334) Merged-In: Icde94342c225f293d0f69660e115ae618270f7db Change-Id: Icde94342c225f293d0f69660e115ae618270f7db --- diff --git a/emulator/car_source.prop_template b/emulator/car_source.prop_template new file mode 100644 index 0000000..587ee30 --- /dev/null +++ b/emulator/car_source.prop_template @@ -0,0 +1,12 @@ +Pkg.Desc=Android SDK System Image +Pkg.UserSrc=false +Pkg.Revision=2 +Pkg.Dependencies=emulator#${EMULATOR_MINIMAL_VERSION} +AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} +AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} +AndroidVersion.ExtensionLevel=${PLATFORM_SDK_EXTENSION_VERSION} +AndroidVersion.IsBaseSdk=${PLATFORM_IS_BASE_SDK} +SystemImage.Abi=${TARGET_CPU_ABI} +SystemImage.GpuSupport=true +SystemImage.TagId=default +SystemImage.TagDisplay=Default Android System Image \ No newline at end of file diff --git a/sdk_car_arm64.mk b/sdk_car_arm64.mk index b5b1501..69fcbea 100644 --- a/sdk_car_arm64.mk +++ b/sdk_car_arm64.mk @@ -24,6 +24,9 @@ device/generic/car/common/config.ini:config.ini endif # EMULATOR_DYNAMIC_MULTIDISPLAY_CONFIG +PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \ + device/generic/car/emulator/car_source.prop_template + # # All components inherited here go to system image # diff --git a/sdk_car_x86_64.mk b/sdk_car_x86_64.mk index e98f0a0..c8d458a 100644 --- a/sdk_car_x86_64.mk +++ b/sdk_car_x86_64.mk @@ -24,6 +24,9 @@ device/generic/car/common/config.ini:config.ini endif # EMULATOR_DYNAMIC_MULTIDISPLAY_CONFIG +PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := \ + device/generic/car/emulator/car_source.prop_template + # # All components inherited here go to system image #