aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/dex_preopt_odex_install.mk1
-rw-r--r--core/package_internal.mk17
-rw-r--r--core/product.mk1
-rw-r--r--core/product_config.mk12
-rw-r--r--core/soong_config.mk2
-rw-r--r--target/board/BoardConfigEmuCommon.mk2
-rw-r--r--target/board/BoardConfigGsiCommon.mk10
-rw-r--r--target/board/generic/BoardConfig.mk5
-rw-r--r--target/board/generic_arm64_a/BoardConfig.mk3
-rw-r--r--target/board/generic_arm64_ab/BoardConfig.mk9
-rw-r--r--target/board/generic_arm_a/BoardConfig.mk3
-rw-r--r--target/board/generic_arm_ab/BoardConfig.mk9
-rw-r--r--target/board/generic_x86_64_a/BoardConfig.mk3
-rw-r--r--target/board/generic_x86_64_ab/BoardConfig.mk9
-rw-r--r--target/board/generic_x86_a/BoardConfig.mk3
-rw-r--r--target/board/generic_x86_ab/BoardConfig.mk9
-rw-r--r--target/product/base_system.mk1
-rw-r--r--target/product/runtime_libart.mk1
18 files changed, 57 insertions, 43 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 17eeb8a11..69790cb10 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -202,6 +202,7 @@ ifdef LOCAL_DEX_PREOPT
202 $(call add_json_bool, ForceCreateAppImage, $(filter true,$(LOCAL_DEX_PREOPT_APP_IMAGE))) 202 $(call add_json_bool, ForceCreateAppImage, $(filter true,$(LOCAL_DEX_PREOPT_APP_IMAGE)))
203 $(call add_json_bool, PresignedPrebuilt, $(filter PRESIGNED,$(LOCAL_CERTIFICATE))) 203 $(call add_json_bool, PresignedPrebuilt, $(filter PRESIGNED,$(LOCAL_CERTIFICATE)))
204 204
205 $(call add_json_bool, NoStripping, $(filter nostripping,$(LOCAL_DEX_PREOPT)))
205 $(call add_json_str, StripInputPath, $$1) 206 $(call add_json_str, StripInputPath, $$1)
206 $(call add_json_str, StripOutputPath, $$2) 207 $(call add_json_str, StripOutputPath, $$2)
207 208
diff --git a/core/package_internal.mk b/core/package_internal.mk
index 698784263..75cc547be 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -87,6 +87,23 @@ else
87 LOCAL_RESOURCE_DIR := $(foreach d,$(LOCAL_RESOURCE_DIR),$(call clean-path,$(d))) 87 LOCAL_RESOURCE_DIR := $(foreach d,$(LOCAL_RESOURCE_DIR),$(call clean-path,$(d)))
88endif 88endif
89 89
90# If LOCAL_MODULE matches a rule in PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES,
91# override the manfest package name by the (first) rule matched
92override_manifest_name := $(strip $(word 1,\
93 $(foreach rule,$(PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES),\
94 $(eval _pkg_name_pat := $(call word-colon,1,$(rule)))\
95 $(eval _manifest_name_pat := $(call word-colon,2,$(rule)))\
96 $(if $(filter $(_pkg_name_pat),$(LOCAL_MODULE)),\
97 $(patsubst $(_pkg_name_pat),$(_manifest_name_pat),$(LOCAL_MODULE))\
98 )\
99 )\
100))
101
102ifneq (,$(override_manifest_name))
103# Note: this can override LOCAL_MANFEST_PACKAGE_NAME value set in Android.mk
104LOCAL_MANIFEST_PACKAGE_NAME := $(override_manifest_name)
105endif
106
90include $(BUILD_SYSTEM)/force_aapt2.mk 107include $(BUILD_SYSTEM)/force_aapt2.mk
91 108
92# Process Support Library dependencies. 109# Process Support Library dependencies.
diff --git a/core/product.mk b/core/product.mk
index 8497b2830..1420b46e1 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -213,6 +213,7 @@ _product_var_list := \
213 PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \ 213 PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \
214 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS \ 214 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS \
215 PRODUCT_XOM_EXCLUDE_PATHS \ 215 PRODUCT_XOM_EXCLUDE_PATHS \
216 PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES \
216 217
217define dump-product 218define dump-product
218$(info ==== $(1) ====)\ 219$(info ==== $(1) ====)\
diff --git a/core/product_config.mk b/core/product_config.mk
index f0f7da14e..47b4c7aa0 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -346,6 +346,11 @@ PRODUCT_SHIPPING_API_LEVEL := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SHI
346# used for adding properties to default.prop 346# used for adding properties to default.prop
347PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \ 347PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \
348 $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_PROPERTY_OVERRIDES)) 348 $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_PROPERTY_OVERRIDES))
349
350$(foreach rule,$(PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES),\
351 $(if $(filter 2,$(words $(subst :,$(space),$(rule)))),,\
352 $(error Rule "$(rule)" in PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDE is not <module_name>:<manifest_name>)))
353
349.KATI_READONLY := PRODUCT_DEFAULT_PROPERTY_OVERRIDES 354.KATI_READONLY := PRODUCT_DEFAULT_PROPERTY_OVERRIDES
350 355
351# A list of property assignments, like "key = value", with zero or more 356# A list of property assignments, like "key = value", with zero or more
@@ -549,3 +554,10 @@ PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION := \
549# set this variable to prevent OTA failures. 554# set this variable to prevent OTA failures.
550PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := \ 555PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := \
551 $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS)) 556 $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS))
557
558# List of <module_name>:<manifest_name> pairs to override the manifest package name
559# of a module <module_name> to <manifest_name>. Patterns can be used as in
560# com.android.%:com.acme.android.%.release
561PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES := \
562 $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES))
563.KATI_READONLY := PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 85be1e7a8..31c77d4b8 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -144,6 +144,8 @@ $(call add_json_bool, FlattenApex, $(filter true,$(TARGET_
144 144
145$(call add_json_str, DexpreoptGlobalConfig, $(DEX_PREOPT_CONFIG)) 145$(call add_json_str, DexpreoptGlobalConfig, $(DEX_PREOPT_CONFIG))
146 146
147$(call add_json_list, ManifestPackageNameOverrides, $(PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES))
148
147$(call add_json_map, VendorVars) 149$(call add_json_map, VendorVars)
148$(foreach namespace,$(SOONG_CONFIG_NAMESPACES),\ 150$(foreach namespace,$(SOONG_CONFIG_NAMESPACES),\
149 $(call add_json_map, $(namespace))\ 151 $(call add_json_map, $(namespace))\
diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk
index 55cd546e1..1e325b949 100644
--- a/target/board/BoardConfigEmuCommon.mk
+++ b/target/board/BoardConfigEmuCommon.mk
@@ -29,4 +29,4 @@ BOARD_FLASH_BLOCK_SIZE := 512
29DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml 29DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml
30 30
31BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common 31BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common
32BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true 32
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk
index a853b3c69..f9e9ee100 100644
--- a/target/board/BoardConfigGsiCommon.mk
+++ b/target/board/BoardConfigGsiCommon.mk
@@ -25,9 +25,13 @@ TARGET_USERIMAGES_USE_F2FS := true
25# Enable dynamic system image size and reserved 64MB in it. 25# Enable dynamic system image size and reserved 64MB in it.
26BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 26BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
27 27
28# Generic AOSP image always requires separate vendor.img 28# GSI always requires separate vendor packages to vendor.img
29TARGET_COPY_OUT_VENDOR := vendor 29TARGET_COPY_OUT_VENDOR := vendor
30 30
31# Creates metadata partition mount point under root for
32# the devices with metadata parition
33BOARD_USES_METADATA_PARTITION := true
34
31# Android Verified Boot (AVB): 35# Android Verified Boot (AVB):
32# Set AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flag 2) in 36# Set AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flag 2) in
33# vbmeta.img to disable AVB verification. 37# vbmeta.img to disable AVB verification.
@@ -43,15 +47,13 @@ BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
43BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) 47BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
44BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 48BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
45 49
50# GSI specific System Properties
46ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) 51ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
47# GSI is always userdebug and needs a couple of properties taking precedence 52# GSI is always userdebug and needs a couple of properties taking precedence
48# over those set by the vendor. 53# over those set by the vendor.
49TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop 54TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop
50endif 55endif
51 56
52# Android generic system image always create metadata partition
53BOARD_USES_METADATA_PARTITION := true
54
55# Set this to create /cache mount point for non-A/B devices that mounts /cache. 57# Set this to create /cache mount point for non-A/B devices that mounts /cache.
56# The partition size doesn't matter, just to make build pass. 58# The partition size doesn't matter, just to make build pass.
57BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 59BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index 738c03731..cdb1d298c 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/target/board/generic/BoardConfig.mk
@@ -16,9 +16,10 @@
16# arm emulator specific definitions 16# arm emulator specific definitions
17TARGET_ARCH := arm 17TARGET_ARCH := arm
18 18
19# Note: Before Pi, we built the platform images for ARMv7-A _without_ NEON. 19# Note: Before P, we built the platform images for ARMv7-A _without_ NEON.
20# Note: Before Q, we built the CTS and SDK images for ARMv7-A _without_ NEON.
20# 21#
21ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk,$(MAKECMDGOALS)),) 22ifneq ($(TARGET_BUILD_APPS),)
22# DO NOT USE 23# DO NOT USE
23# 24#
24# This architecture variant should NOT be used for 32 bit arm platform 25# This architecture variant should NOT be used for 32 bit arm platform
diff --git a/target/board/generic_arm64_a/BoardConfig.mk b/target/board/generic_arm64_a/BoardConfig.mk
index f77dbe5f8..68aedfc1a 100644
--- a/target/board/generic_arm64_a/BoardConfig.mk
+++ b/target/board/generic_arm64_a/BoardConfig.mk
@@ -27,3 +27,6 @@ TARGET_2ND_ARCH_VARIANT := armv8-a
27TARGET_2ND_CPU_ABI := armeabi-v7a 27TARGET_2ND_CPU_ABI := armeabi-v7a
28TARGET_2ND_CPU_ABI2 := armeabi 28TARGET_2ND_CPU_ABI2 := armeabi
29TARGET_2ND_CPU_VARIANT := generic 29TARGET_2ND_CPU_VARIANT := generic
30
31# This is a non-system-as-root Legacy GSI build target
32BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk
index 073eccb9d..6e54d810b 100644
--- a/target/board/generic_arm64_ab/BoardConfig.mk
+++ b/target/board/generic_arm64_ab/BoardConfig.mk
@@ -28,21 +28,12 @@ TARGET_2ND_CPU_ABI := armeabi-v7a
28TARGET_2ND_CPU_ABI2 := armeabi 28TARGET_2ND_CPU_ABI2 := armeabi
29TARGET_2ND_CPU_VARIANT := generic 29TARGET_2ND_CPU_VARIANT := generic
30 30
31# Enable System-as-Root
32TARGET_NO_RECOVERY := true
33BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
34
35# TODO(jiyong) These might be SoC specific. 31# TODO(jiyong) These might be SoC specific.
36BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist 32BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist
37BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp 33BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
38BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image 34BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image
39BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo 35BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo
40 36
41# Set this to create /cache mount point for non-A/B devices that mounts /cache.
42# The partition size doesn't matter, just to make build pass.
43BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
44BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
45
46# TODO(b/36764215): remove this setting when the generic system image 37# TODO(b/36764215): remove this setting when the generic system image
47# no longer has QCOM-specific directories under /. 38# no longer has QCOM-specific directories under /.
48BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy 39BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy
diff --git a/target/board/generic_arm_a/BoardConfig.mk b/target/board/generic_arm_a/BoardConfig.mk
index cba222a73..464a74f1e 100644
--- a/target/board/generic_arm_a/BoardConfig.mk
+++ b/target/board/generic_arm_a/BoardConfig.mk
@@ -24,3 +24,6 @@ TARGET_CPU_VARIANT := generic
24 24
25# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch 25# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch
26TARGET_USES_64_BIT_BINDER := false 26TARGET_USES_64_BIT_BINDER := false
27
28# This is a non-system-as-root Legacy GSI build target
29BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
diff --git a/target/board/generic_arm_ab/BoardConfig.mk b/target/board/generic_arm_ab/BoardConfig.mk
index 087543e92..9100094f8 100644
--- a/target/board/generic_arm_ab/BoardConfig.mk
+++ b/target/board/generic_arm_ab/BoardConfig.mk
@@ -25,21 +25,12 @@ TARGET_CPU_VARIANT := generic
25# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch 25# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch
26TARGET_USES_64_BIT_BINDER := false 26TARGET_USES_64_BIT_BINDER := false
27 27
28# Enable System-as-Root
29TARGET_NO_RECOVERY := true
30BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
31
32# TODO(jiyong) These might be SoC specific. 28# TODO(jiyong) These might be SoC specific.
33BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist 29BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist
34BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp 30BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
35BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image 31BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image
36BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo 32BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo
37 33
38# Set this to create /cache mount point for non-A/B devices that mounts /cache.
39# The partition size doesn't matter, just to make build pass.
40BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
41BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
42
43# TODO(b/36764215): remove this setting when the generic system image 34# TODO(b/36764215): remove this setting when the generic system image
44# no longer has QCOM-specific directories under /. 35# no longer has QCOM-specific directories under /.
45BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy 36BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy
diff --git a/target/board/generic_x86_64_a/BoardConfig.mk b/target/board/generic_x86_64_a/BoardConfig.mk
index 1dd5e4898..07eef4f42 100644
--- a/target/board/generic_x86_64_a/BoardConfig.mk
+++ b/target/board/generic_x86_64_a/BoardConfig.mk
@@ -23,3 +23,6 @@ TARGET_ARCH_VARIANT := x86_64
23TARGET_2ND_CPU_ABI := x86 23TARGET_2ND_CPU_ABI := x86
24TARGET_2ND_ARCH := x86 24TARGET_2ND_ARCH := x86
25TARGET_2ND_ARCH_VARIANT := x86_64 25TARGET_2ND_ARCH_VARIANT := x86_64
26
27# This is a non-system-as-root Legacy GSI build target
28BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
diff --git a/target/board/generic_x86_64_ab/BoardConfig.mk b/target/board/generic_x86_64_ab/BoardConfig.mk
index 09ce95d67..1dd5e4898 100644
--- a/target/board/generic_x86_64_ab/BoardConfig.mk
+++ b/target/board/generic_x86_64_ab/BoardConfig.mk
@@ -23,12 +23,3 @@ TARGET_ARCH_VARIANT := x86_64
23TARGET_2ND_CPU_ABI := x86 23TARGET_2ND_CPU_ABI := x86
24TARGET_2ND_ARCH := x86 24TARGET_2ND_ARCH := x86
25TARGET_2ND_ARCH_VARIANT := x86_64 25TARGET_2ND_ARCH_VARIANT := x86_64
26
27# Enable System-as-Root
28TARGET_NO_RECOVERY := true
29BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
30
31# Set this to create /cache mount point for non-A/B devices that mounts /cache.
32# The partition size doesn't matter, just to make build pass.
33BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
34BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
diff --git a/target/board/generic_x86_a/BoardConfig.mk b/target/board/generic_x86_a/BoardConfig.mk
index 53acffd23..e3e8a3afe 100644
--- a/target/board/generic_x86_a/BoardConfig.mk
+++ b/target/board/generic_x86_a/BoardConfig.mk
@@ -22,3 +22,6 @@ TARGET_ARCH_VARIANT := x86
22 22
23# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch 23# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch
24TARGET_USES_64_BIT_BINDER := false 24TARGET_USES_64_BIT_BINDER := false
25
26# This is a non-system-as-root Legacy GSI build target
27BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
diff --git a/target/board/generic_x86_ab/BoardConfig.mk b/target/board/generic_x86_ab/BoardConfig.mk
index cc8ab70ce..53acffd23 100644
--- a/target/board/generic_x86_ab/BoardConfig.mk
+++ b/target/board/generic_x86_ab/BoardConfig.mk
@@ -22,12 +22,3 @@ TARGET_ARCH_VARIANT := x86
22 22
23# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch 23# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch
24TARGET_USES_64_BIT_BINDER := false 24TARGET_USES_64_BIT_BINDER := false
25
26# Enable System-as-Root
27TARGET_NO_RECOVERY := true
28BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
29
30# Set this to create /cache mount point for non-A/B devices that mounts /cache.
31# The partition size doesn't matter, just to make build pass.
32BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
33BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 07fea22f1..63db56425 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -62,6 +62,7 @@ PRODUCT_PACKAGES += \
62 CtsShimPrivPrebuilt \ 62 CtsShimPrivPrebuilt \
63 debuggerd\ 63 debuggerd\
64 DefaultContainerService \ 64 DefaultContainerService \
65 dmctl \
65 dnsmasq \ 66 dnsmasq \
66 DownloadProvider \ 67 DownloadProvider \
67 dpm \ 68 dpm \
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 6d835fd42..71834aa5e 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -100,4 +100,5 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
100 100
101# Enable minidebuginfo generation unless overridden. 101# Enable minidebuginfo generation unless overridden.
102PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ 102PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
103 dalvik.vm.minidebuginfo=true \
103 dalvik.vm.dex2oat-minidebuginfo=true 104 dalvik.vm.dex2oat-minidebuginfo=true