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

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

Merge "Fix releasetools device_specific error case" into main am: 642c311a 

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



Change-Id: Iff29784814625e7a51b33a858e10fb04b3ac8c56
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d566007 642c311a

tools/releasetools/common.py

+2 −0
Original line number Diff line number Diff line
@@ -3138,6 +3138,8 @@ class DeviceSpecificParams(object): 
        if not os.path.exists(path) and os.path.exists(path + ".py"):

          path = path + ".py"

        spec = importlib.util.spec_from_file_location("device_specific", path)

        if not spec:

          raise FileNotFoundError(path)

        logger.info("loaded device-specific extensions from %s", path)

        module = importlib.util.module_from_spec(spec)

        spec.loader.exec_module(module)

tools/releasetools/test_common.py

+8 −0
Original line number Diff line number Diff line
@@ -2157,3 +2157,11 @@ class PartitionBuildPropsTest(test_utils.ReleaseToolsTestCase): 
        'google/coral/coral:10/RP1A.200325.001/6337676:user/dev-keys',

        'ro.product.odm.device': 'coral',

    }, copied_props.build_props)





class DeviceSpecificParamsTest(test_utils.ReleaseToolsTestCase):



  def test_missingSource(self):

    common.OPTIONS.device_specific = '/does_not_exist'

    ds = DeviceSpecificParams()

    self.assertIsNone(ds.module)