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

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

Change-Id: I1e2ef5b0589ffa1a95d31f99c6f73a57b5d8cd5f
This commit is contained in:
Treehugger Robot
2020-07-01 01:48:14 +00:00
committed by Automerger Merge Worker
parent 3105f78ef6 91fd2d719e
commit 1a74423603
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))) $(empty)))
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# odm/build.prop # odm/etc/build.prop
# #
_prop_files_ := $(if $(TARGET_ODM_PROP),\ _prop_files_ := $(if $(TARGET_ODM_PROP),\
$(TARGET_ODM_PROP),\ $(TARGET_ODM_PROP),\
@@ -385,7 +385,9 @@ _prop_vars_ := \
ADDITIONAL_ODM_PROPERTIES \ ADDITIONAL_ODM_PROPERTIES \
PRODUCT_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,\ $(eval $(call build-properties,\
odm,\ odm,\
$(INSTALLED_ODM_BUILD_PROP_TARGET),\ $(INSTALLED_ODM_BUILD_PROP_TARGET),\