Merge branch 'main' into pr/34571

facebook · Sep 23, 2022 · 4abf495 · 4abf495
2 parents 85f87b4 + 065db68
commit 4abf495
Show file tree

Hide file tree

Showing 679 changed files with 31,649 additions and 7,417 deletions.
diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android
@@ -21,7 +21,6 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
 
 # set default environment variables
 ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
-ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
 ENV KOTLIN_HOME="third-party/kotlin"
 
 ADD .buckconfig /app/.buckconfig