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

Commit 63ce74b0 authored by Simon Shields's avatar Simon Shields Committed by Michael Bestas
Browse files

cm: support lineage device trees

Change-Id: Id7d7c5747639903d1289557dab38341d5c7cc287
parent 63c9392f
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -59,13 +59,18 @@ function breakfast()
            # A buildtype was specified, assume a full device name
            lunch $target
        else
            # This is probably just the CM model name
            # This is probably just the Lineage model name
            if [ -z "$variant" ]; then
                variant="userdebug"
            fi
            lunch lineage_$target-$variant
            if [ $? -ne 0 ]; then
                # try CM
                echo "** Warning: '$target' is using CM-based makefiles. This will be deprecated in the next major release."
                lunch cm_$target-$variant
            fi
        fi
    fi
    return $?
}

+25 −20
Original line number Diff line number Diff line
@@ -203,10 +203,12 @@ def add_to_manifest(repositories, fallback_branch = None):

def fetch_dependencies(repo_path, fallback_branch = None):
    print('Looking for dependencies in %s' % repo_path)
    dependencies_path = repo_path + '/cm.dependencies'
    dependencies_paths = [repo_path + '/lineage.dependencies', repo_path + '/cm.dependencies']
    found_dependencies = False
    syncable_repos = []
    verify_repos = []

    for dependencies_path in dependencies_paths:
        if os.path.exists(dependencies_path):
            dependencies_file = open(dependencies_path, 'r')
            dependencies = json.loads(dependencies_file.read())
@@ -221,11 +223,14 @@ def fetch_dependencies(repo_path, fallback_branch = None):
                    verify_repos.append(dependency['target_path'])

            dependencies_file.close()
            found_dependencies = True

            if len(fetch_list) > 0:
                print('Adding dependencies to manifest')
                add_to_manifest(fetch_list, fallback_branch)
    else:
            break

    if not found_dependencies:
        print('Dependencies file not found, bailing out.')

    if len(syncable_repos) > 0: