commit 3a3d501e11c636e640010e6132fc51df81628e91
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 01 01:16:44 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 01 01:16:44 2020 +0000
tree b0d96a92ff1fe6441c50e6d9b41b7ddd91029bd4
parent b9a27f4e7d07b2e6cb2cf27b5eebe62cbb634e67
parent 62117c857d52429b60f603a108ca362d0075729d

Merge "build.prop for ODM partition is under ./etc subdir"

core/sysprop.mk

diff --git a/core/sysprop.mk b/core/sysprop.mk
index 0cee81c..fdf92b7 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -361,7 +361,7 @@
     $(empty)))
 
 # ----------------------------------------------------------------
-# odm/build.prop
+# odm/etc/build.prop
 #
 _prop_files_ := $(if $(TARGET_ODM_PROP),\
     $(TARGET_ODM_PROP),\
@@ -373,7 +373,9 @@
     ADDITIONAL_ODM_PROPERTIES \
     PRODUCT_ODM_PROPERTIES
 
-INSTALLED_ODM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM)/build.prop
+# Note the 'etc' sub directory. For the reason, see
+# I0733c277baa67c549bb45599abb70aba13fbdbcf
+INSTALLED_ODM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM)/etc/build.prop
 $(eval $(call build-properties,\
     odm,\
     $(INSTALLED_ODM_BUILD_PROP_TARGET),\