Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6b79f12 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "build.prop for ODM partition is under ./etc subdir" am: 3a3d501e am:... 

Merge "build.prop for ODM partition is under ./etc subdir" am: 3a3d501e am: 91fd2d71 am: 1a744236 am: 451a5fcd

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

Change-Id: Iefac39791732b619a2db83dce60ab57b1ee94f48
parents 8a61f0e4 451a5fcd

core/sysprop.mk

+4 −2
Original line number Diff line number Diff line
@@ -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),\