diff --git a/aosp-merger/aosp-merger.sh b/aosp-merger/aosp-merger.sh index 21b4909..8a73f61 100755 --- a/aosp-merger/aosp-merger.sh +++ b/aosp-merger/aosp-merger.sh @@ -166,7 +166,7 @@ main() { readonly device_kernel_repos="kernel/google/${kernel}" - export MERGEDREPOS="${TOP}/merged_repos_${kernel}.txt" + export MERGEDREPOS="${TOP}/merged_repos_${kernel}_kernel.txt" # Remove any existing list of merged repos file rm -f "${MERGEDREPOS}" @@ -202,7 +202,7 @@ main() { for kernel in ${kernel_repos[@]}; do ( source "${vars_path}/${kernel}" - export MERGEDREPOS="${TOP}/merged_repos_${kernel}.txt" + export MERGEDREPOS="${TOP}/merged_repos_${kernel}_kernel.txt" push_kernel_merge