StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "build.prop for ODM partition is under ./etc subdir" am: 3a3d501e11 am: 91fd2d719e am: 1a74423603

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1351282

Change-Id: I714ae3d8357f9cca9929e678513744a66b75df9e
This commit is contained in:
Treehugger Robot
2020-07-01 02:02:59 +00:00
committed by Automerger Merge Worker
parent 3b47bc2b63 1a74423603
commit 451a5fcdb3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/sysprop.mk
View File

@@ -373,7 +373,7 @@ $(eval $(call build-properties,\
$(empty)))
# ----------------------------------------------------------------
# odm/build.prop
# odm/etc/build.prop
#
_prop_files_ := $(if $(TARGET_ODM_PROP),\
$(TARGET_ODM_PROP),\
@@ -385,7 +385,9 @@ _prop_vars_ := \
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),\