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

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

Merge "Emit warning when build.prop import can't be resolved" am: 52f1acbd am: a840a264

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

Change-Id: I3ea1085e16538bcedbd0373a4b8e84aaa3bcc347
parents 0f22ebfe a840a264
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -1026,7 +1026,8 @@ class PartitionBuildProps(object):

    import_path = tokens[1]
    if not re.match(r'^/{}/.*\.prop$'.format(self.partition), import_path):
      raise ValueError('Unrecognized import path {}'.format(line))
      logger.warn('Unrecognized import path {}'.format(line))
      return {}

    # We only recognize a subset of import statement that the init process
    # supports. And we can loose the restriction based on how the dynamic