diff options
| author | Jiyong Park <jiyong@google.com> | 2020-05-25 17:37:28 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-05-27 12:52:44 +0900 |
| commit | ca9b02c1ce9a3d1cf39648e712d0f85c6e93f7fc (patch) | |
| tree | 613384c07a7f26cb7f56e76c141abe21e32b6420 | |
| parent | ae55638f75b2b1d99ba19cf4ac7a47d61af12eba (diff) | |
| download | build-ca9b02c1ce9a3d1cf39648e712d0f85c6e93f7fc.tar.gz | |
Make use of ADDITIONAL_ODM_PROPERTIES
Properties that were defined in the build rule for odm/build.prop are
now defined via ADDITIONAL_ODM_PROPERTIES.
Bug: 117892318
Test: m
Change-Id: I6220e217d0724b6e27127786e7a908e1e662d1a0
| -rw-r--r-- | core/main.mk | 5 | ||||
| -rw-r--r-- | core/sysprop.mk | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/main.mk b/core/main.mk index 98fb4ce77d..c8ede6e578 100644 --- a/core/main.mk +++ b/core/main.mk @@ -313,6 +313,11 @@ ADDITIONAL_VENDOR_PROPERTIES += \ ro.build.ab_update=$(AB_OTA_UPDATER) endif +ADDITIONAL_ODM_PROPERTIES += \ + ro.odm.product.cpu.abilist=$(TARGET_CPU_ABI_LIST) \ + ro.odm.product.cpu.abilist32=$(TARGET_CPU_ABI_LIST_32_BIT) \ + ro.odm.product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT) + # Set ro.product.vndk.version to know the VNDK version required by product # modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value # is "current", use PLATFORM_VNDK_VERSION. diff --git a/core/sysprop.mk b/core/sysprop.mk index e2a3153fde..d895d42ab1 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -368,9 +368,6 @@ $(INSTALLED_ODM_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(POST_PROCESS_PROPS) @echo Target odm buildinfo: $@ @mkdir -p $(dir $@) $(hide) rm -f $@ && touch $@ - $(hide) echo ro.odm.product.cpu.abilist="$(TARGET_CPU_ABI_LIST)">>$@ - $(hide) echo ro.odm.product.cpu.abilist32="$(TARGET_CPU_ABI_LIST_32_BIT)">>$@ - $(hide) echo ro.odm.product.cpu.abilist64="$(TARGET_CPU_ABI_LIST_64_BIT)">>$@ $(hide) $(call generate-common-build-props,odm,$@) $(hide) $(foreach file,$(odm_prop_files), \ if [ -f "$(file)" ]; then \ |