File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed
Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -17,8 +17,12 @@ _sync() {
1717 # Remove local manifests
1818 find " ${ROM_DIR} " /.repo/local_manifests/ -type f -exec rm {} \;
1919 if [[ -n " ${LOCAL_MANIFEST} " ]]; then
20- # Merge local manifests into one to avoid conflicts with duplicate dependencies
21- " ${SCRIPT_DIR} " /xml_manifest_gen.py " ${LOCAL_MANIFEST} " > " ${ROM_DIR} " /.repo/local_manifests/manifest.xml
20+ if grep -q ' ,' <<< " ${LOCAL_MANIFEST}" ; then
21+ # Merge local manifests into one to avoid conflicts with duplicate dependencies
22+ " ${SCRIPT_DIR} " /xml_manifest_gen.py " ${LOCAL_MANIFEST} " > " ${ROM_DIR} " /.repo/local_manifests/manifest.xml
23+ else
24+ curl_cmd " ${LOCAL_MANIFEST} " --output " ${ROM_DIR} " /.repo/local_manifests/manifest.xml
25+ fi
2226 elif [[ -z " ${CLONE_REPOS} " ]]; then
2327 # Generate vendor manifest, so that official lineage just builds
2428 " ${SCRIPT_DIR} " /xml_roomservice.py " ${DEVICE} " " ${ROM_BRANCH} " > " ${ROM_DIR} " /.repo/local_manifests/manifest.xml
You can’t perform that action at this time.
0 commit comments