diff options
author | Christopher Ferris | 2014-12-11 12:31:59 -0600 |
---|---|---|
committer | Gerrit Code Review | 2014-12-11 12:32:00 -0600 |
commit | 3115b34c9299d69919de39d01bfbbbe5e798e3b2 (patch) | |
tree | d9b60ad37dfc06ed38552cce855a65a0a412ea81 | |
parent | e7b8bc4e291a08dfb6f2f84a2bb0ca99f3bbada6 (diff) | |
parent | fa343e630d9a96039987ba163aef5b475428d614 (diff) | |
download | platform-bionic-3115b34c9299d69919de39d01bfbbbe5e798e3b2.tar.gz platform-bionic-3115b34c9299d69919de39d01bfbbbe5e798e3b2.tar.xz platform-bionic-3115b34c9299d69919de39d01bfbbbe5e798e3b2.zip |
Merge "fix runtime issues for scripts"
-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 386159aa..90ba0ed3 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 | |||
159 | cd "${TMPDIR}" | 159 | cd "${TMPDIR}" |
160 | echo "Fetching android kernel source ${KERNEL_VERSION}" | 160 | echo "Fetching android kernel source ${KERNEL_VERSION}" |
161 | git clone https://android.googlesource.com/kernel/common.git | 161 | git clone https://android.googlesource.com/kernel/common.git |
162 | cd "${COMMON}" | 162 | cd "${src_dir}" |
163 | git checkout "${KERNEL_VERSION}" | 163 | git checkout "${KERNEL_VERSION}" |
164 | KERNEL_DIR="${TMPDIR}" | 164 | KERNEL_DIR="${TMPDIR}" |
165 | elif [[ "${KERNEL_DIR}" == "" ]]; then | 165 | elif [[ "${KERNEL_DIR}" == "" ]]; then |
@@ -180,6 +180,8 @@ if [[ ${SKIP_GENERATION} -eq 0 ]]; then | |||
180 | done | 180 | done |
181 | fi | 181 | fi |
182 | 182 | ||
183 | cd ${ANDROID_BUILD_TOP} | ||
184 | |||
183 | # Copy all of the include/uapi files to the kernel headers uapi directory. | 185 | # Copy all of the include/uapi files to the kernel headers uapi directory. |
184 | copy_hdrs "${KERNEL_DIR}/${src_dir}/include/uapi" "${ANDROID_KERNEL_DIR}/uapi" | 186 | copy_hdrs "${KERNEL_DIR}/${src_dir}/include/uapi" "${ANDROID_KERNEL_DIR}/uapi" |
185 | 187 | ||
diff --git a/libc/kernel/tools/update_all.py b/libc/kernel/tools/update_all.py index 73862da1..f45d4e05 100755 --- a/libc/kernel/tools/update_all.py +++ b/libc/kernel/tools/update_all.py | |||
@@ -40,12 +40,7 @@ else: | |||
40 | if not os.path.isdir(original_dir): | 40 | if not os.path.isdir(original_dir): |
41 | panic( "Missing directory, please specify one through command-line: %s\n" % original_dir ) | 41 | panic( "Missing directory, please specify one through command-line: %s\n" % original_dir ) |
42 | 42 | ||
43 | # Fixme: This should be removed after next release. | ||
44 | # Do not update ion.h ion_test.h until after next release in aosp. | ||
45 | source = subprocess.check_output('git remote show', shell=True).strip() | ||
46 | skip_ion = False | 43 | skip_ion = False |
47 | if source == "aosp": | ||
48 | skip_ion = True | ||
49 | 44 | ||
50 | # find all source files in 'original' | 45 | # find all source files in 'original' |
51 | # | 46 | # |