tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "fix runtime issues for scripts"

Browse source
This commit is contained in:
Christopher Ferris 2014-12-11 18:31:59 +00:00 committed by Gerrit Code Review
commit 3115b34c92
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libc/kernel/tools/generate_uapi_headers.sh
View file

@ -159,7 +159,7 @@ if [[ ${KERNEL_DOWNLOAD} -eq 1 ]]; then
cd "${TMPDIR}" cd "${TMPDIR}"
echo "Fetching android kernel source ${KERNEL_VERSION}" echo "Fetching android kernel source ${KERNEL_VERSION}"
git clone https://android.googlesource.com/kernel/common.git git clone https://android.googlesource.com/kernel/common.git
cd "${COMMON}" cd "${src_dir}"
git checkout "${KERNEL_VERSION}" git checkout "${KERNEL_VERSION}"
KERNEL_DIR="${TMPDIR}" KERNEL_DIR="${TMPDIR}"
elif [[ "${KERNEL_DIR}" == "" ]]; then elif [[ "${KERNEL_DIR}" == "" ]]; then
@ -180,6 +180,8 @@ if [[ ${SKIP_GENERATION} -eq 0 ]]; then
done done
fi fi
cd ${ANDROID_BUILD_TOP}
# Copy all of the include/uapi files to the kernel headers uapi directory. # 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" copy_hdrs "${KERNEL_DIR}/${src_dir}/include/uapi" "${ANDROID_KERNEL_DIR}/uapi"

5
libc/kernel/tools/update_all.py
View file

@ -40,12 +40,7 @@ else:
if not os.path.isdir(original_dir): if not os.path.isdir(original_dir):
panic( "Missing directory, please specify one through command-line: %s\n" % 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 skip_ion = False
if source == "aosp":
skip_ion = True
# find all source files in 'original' # find all source files in 'original'
# #