Skip to content

Commit 7ce8a10

Browse files
authored
Update make_sdk.yml
1 parent 8075038 commit 7ce8a10

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/make_sdk.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
version:
88
description: "Platform Tools Version"
99
required: true
10-
default: "35.0.2"
10+
default: "35.0.0"
1111
tag:
1212
description: "Android Source Tag"
1313
required: true
14-
default: "platform-tools-35.0.2"
14+
default: "platform-tools-35.0.0"
1515

1616
permissions:
1717
contents: write
@@ -117,7 +117,7 @@ jobs:
117117
HOST_SDK="${PWD}/android-sdk"
118118
BUILT_SDK="${PWD}/build-${{ matrix.target_triple }}"
119119
120-
find "${HOST_SDK}/build-tools/${{ inputs.version }}" -type f | while IFS= read -r file; do
120+
find "${HOST_SDK}/build-tools/35.0.0" -type f | while IFS= read -r file; do
121121
bname="$(basename "${file}")"
122122
if [ -f "${BUILT_SDK}/${bname}" ] && file "${file}" | grep -q 'ELF'; then
123123
echo "Replacing ${bname}"
@@ -133,15 +133,15 @@ jobs:
133133
fi
134134
done
135135
136-
rm -rf ${HOST_SDK}/build-tools/${{ inputs.version }}/lib64
136+
rm -rf ${HOST_SDK}/build-tools/35.0.0/lib64
137137
rm -rf ${HOST_SDK}/platform-tools/lib64
138-
rm -rf ${HOST_SDK}/build-tools/${{ inputs.version }}/*-ld ${HOST_SDK}/build-tools/${{ inputs.version }}/lld* ${HOST_SDK}/build-tools/${{ inputs.version }}/llvm-rs-cc ${HOST_SDK}/build-tools/${{ inputs.version }}/bcc_compat ${HOST_SDK}/build-tools/${{ inputs.version }}/renderscript
138+
rm -rf ${HOST_SDK}/build-tools/35.0.0/*-ld ${HOST_SDK}/build-tools/35.0.0/lld* ${HOST_SDK}/build-tools/35.0.0/llvm-rs-cc ${HOST_SDK}/build-tools/35.0.0/bcc_compat ${HOST_SDK}/build-tools/35.0.0/renderscript
139139
sed -i -e '1s|^#!.*bash|#!/bin/sh|' \
140140
-e 's/^declare -a javaOpts=()/javaOpts=""/' \
141141
-e 's/javaOpts+=("-\${opt}")/javaOpts="\$javaOpts -\${opt}"/' \
142142
-e 's/javaOpts+=("\${defaultMx}")/javaOpts="\$javaOpts \${defaultMx}"/' \
143-
-e 's|"\${javaOpts\[@\]}"|$javaOpts|' ${HOST_SDK}/build-tools/${{ inputs.version }}/d8
144-
sed -i '1s|^#!.*bash|#!/bin/sh|' ${HOST_SDK}/build-tools/${{ inputs.version }}/apksigner
143+
-e 's|"\${javaOpts\[@\]}"|$javaOpts|' ${HOST_SDK}/build-tools/35.0.0/d8
144+
sed -i '1s|^#!.*bash|#!/bin/sh|' ${HOST_SDK}/build-tools/35.0.0/apksigner
145145
146146
- name: Archive
147147
run: tar -cf - android-sdk | xz -T0 -9e --lzma2=dict=256MiB > android-sdk-${{matrix.target_triple}}.tar.xz

0 commit comments

Comments
 (0)