diff options
| -rwxr-xr-x | libc/kernel/tools/generate_uapi_headers.sh | 4 | ||||
| -rwxr-xr-x | libc/kernel/tools/update_all.py | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libc/kernel/tools/generate_uapi_headers.sh b/libc/kernel/tools/generate_uapi_headers.sh index 386159aab..90ba0ed3d 100755 --- a/libc/kernel/tools/generate_uapi_headers.sh +++ b/libc/kernel/tools/generate_uapi_headers.sh @@ -159,7 +159,7 @@ if [[ ${KERNEL_DOWNLOAD} -eq 1 ]]; then cd "${TMPDIR}" echo "Fetching android kernel source ${KERNEL_VERSION}" git clone https://android.googlesource.com/kernel/common.git - cd "${COMMON}" + cd "${src_dir}" git checkout "${KERNEL_VERSION}" KERNEL_DIR="${TMPDIR}" elif [[ "${KERNEL_DIR}" == "" ]]; then @@ -180,6 +180,8 @@ if [[ ${SKIP_GENERATION} -eq 0 ]]; then done fi +cd ${ANDROID_BUILD_TOP} + # Copy all of the include/uapi files to the kernel headers uapi directory. copy_hdrs "${KERNEL_DIR}/${src_dir}/include/uapi" "${ANDROID_KERNEL_DIR}/uapi" diff --git a/libc/kernel/tools/update_all.py b/libc/kernel/tools/update_all.py index 73862da17..f45d4e057 100755 --- a/libc/kernel/tools/update_all.py +++ b/libc/kernel/tools/update_all.py @@ -40,12 +40,7 @@ else: if not os.path.isdir(original_dir): panic( "Missing directory, please specify one through command-line: %s\n" % original_dir ) -# Fixme: This should be removed after next release. -# Do not update ion.h ion_test.h until after next release in aosp. -source = subprocess.check_output('git remote show', shell=True).strip() skip_ion = False -if source == "aosp": - skip_ion = True # find all source files in 'original' # |