aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyunam Jo2014-12-10 00:06:46 -0600
committerKyunam Jo2014-12-10 01:53:07 -0600
commitfa343e630d9a96039987ba163aef5b475428d614 (patch)
tree549f9959fea10485e4dad45f4439d70bd3c910b5
parent6a6845244cf9eb8fe21ecc012b7b45990adad7d8 (diff)
downloadplatform-bionic-fa343e630d9a96039987ba163aef5b475428d614.tar.gz
platform-bionic-fa343e630d9a96039987ba163aef5b475428d614.tar.xz
platform-bionic-fa343e630d9a96039987ba163aef5b475428d614.zip
fix runtime issues for scripts
now, some script to update kernel-headers is not working. because of wrong variable value and test codes. so this issue is fixed. Change-Id: Iffae9607858cc3c1c58fa24244be217b5a1ab06e
-rwxr-xr-xlibc/kernel/tools/generate_uapi_headers.sh4
-rwxr-xr-xlibc/kernel/tools/update_all.py5
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}"
165elif [[ "${KERNEL_DIR}" == "" ]]; then 165elif [[ "${KERNEL_DIR}" == "" ]]; then
@@ -180,6 +180,8 @@ if [[ ${SKIP_GENERATION} -eq 0 ]]; then
180 done 180 done
181fi 181fi
182 182
183cd ${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.
184copy_hdrs "${KERNEL_DIR}/${src_dir}/include/uapi" "${ANDROID_KERNEL_DIR}/uapi" 186copy_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.
45source = subprocess.check_output('git remote show', shell=True).strip()
46skip_ion = False 43skip_ion = False
47if source == "aosp":
48 skip_ion = True
49 44
50# find all source files in 'original' 45# find all source files in 'original'
51# 46#