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
......@@ -59,11 +59,16 @@ 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 cm_$target-$variant
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 $?
......
......@@ -203,29 +203,34 @@ 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 = []
if os.path.exists(dependencies_path):
dependencies_file = open(dependencies_path, 'r')
dependencies = json.loads(dependencies_file.read())
fetch_list = []
for dependency in dependencies:
if not is_in_manifest(dependency['target_path']):
fetch_list.append(dependency)
syncable_repos.append(dependency['target_path'])
verify_repos.append(dependency['target_path'])
elif re.search("android_device_.*_.*$", dependency['repository']):
verify_repos.append(dependency['target_path'])
dependencies_file.close()
if len(fetch_list) > 0:
print('Adding dependencies to manifest')
add_to_manifest(fetch_list, fallback_branch)
else:
for dependencies_path in dependencies_paths:
if os.path.exists(dependencies_path):
dependencies_file = open(dependencies_path, 'r')
dependencies = json.loads(dependencies_file.read())
fetch_list = []
for dependency in dependencies:
if not is_in_manifest(dependency['target_path']):
fetch_list.append(dependency)
syncable_repos.append(dependency['target_path'])
verify_repos.append(dependency['target_path'])
elif re.search("android_device_.*_.*$", dependency['repository']):
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)
break
if not found_dependencies:
print('Dependencies file not found, bailing out.')
if len(syncable_repos) > 0:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment