Skip to content

Commit df2cfe1

Browse files
authored
Fix android ci
Overwrite deprecated env to avoid use unexpected android sdk
1 parent 81af90d commit df2cfe1

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

tools/unix-ci/setup_android.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,14 @@ def export_environment(ndk_only):
117117
if not ndk_only:
118118
myfile.write("export ANDROID_SDK=" + ANDROID_SDK + "\n")
119119
myfile.write("export ANDROID_HOME=" + ANDROID_SDK + "\n")
120+
myfile.write("export ANDROID_SDK_ROOT=" + ANDROID_SDK + "\n")
120121
myfile.write("export ANDROID_NDK=" + ANDROID_NDK + "\n")
121122

122123
with open(os.path.join(ROOT_DIR, "environment.ps1"), "a") as myfile:
123124
if not ndk_only:
124125
myfile.write("$env:ANDROID_SDK=\"" + ANDROID_SDK + "\"\n")
125126
myfile.write("$env:ANDROID_HOME=\"" + ANDROID_SDK + "\"\n")
127+
myfile.write("$env:ANDROID_SDK_ROOT=\"" + ANDROID_SDK + "\"\n")
126128
myfile.write("$env:ANDROID_NDK=\"" + ANDROID_NDK + "\"\n")
127129

128130
def main(ndk_only):

0 commit comments

Comments
 (0)