iOS JIT support and enhancements for scenarios app (#10820)

* Make the scripts runnable from any directory

* Add JIT script for iOS
This commit is contained in:
Dan Field 2019-08-12 09:10:12 -07:00 committed by GitHub
parent d3be62888b
commit 79c50123a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 96 additions and 15 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash
./compile_android_aot.sh $1 $2
"${BASH_SOURCE%/*}/compile_android_aot.sh" $1 $2
pushd android
pushd "${BASH_SOURCE%/*}/android"
./gradlew assembleDebug --no-daemon
popd

View File

@ -22,7 +22,7 @@ fi
echo "Using dart from $HOST_TOOLS, gen_snapshot from $DEVICE_TOOLS."
OUTDIR="build/android"
OUTDIR="${BASH_SOURCE%/*}/build/android"
echo "Creating $OUTDIR..."
@ -35,15 +35,15 @@ echo "Compiling kernel..."
--sdk-root "$HOST_TOOLS/flutter_patched_sdk" \
--aot --tfa --target=flutter \
--output-dill "$OUTDIR/app.dill" \
lib/main.dart
"${BASH_SOURCE%/*}/lib/main.dart"
echo "Compiling ELF Shared Library..."
"$DEVICE_TOOLS/gen_snapshot" --deterministic --snapshot_kind=app-aot-elf --elf="$OUTDIR/libapp.so" --strip "$OUTDIR/app.dill"
mkdir -p "android/app/src/main/jniLibs/arm64-v8a"
mkdir -p "android/app/libs"
cp "$OUTDIR/libapp.so" "android/app/src/main/jniLibs/arm64-v8a/"
cp "$DEVICE_TOOLS/../flutter.jar" "android/app/libs/"
mkdir -p "${BASH_SOURCE%/*}/android/app/src/main/jniLibs/arm64-v8a"
mkdir -p "${BASH_SOURCE%/*}/android/app/libs"
cp "$OUTDIR/libapp.so" "${BASH_SOURCE%/*}/android/app/src/main/jniLibs/arm64-v8a/"
cp "$DEVICE_TOOLS/../flutter.jar" "${BASH_SOURCE%/*}/android/app/libs/"
echo "Created $OUTDIR/libapp.so."

View File

@ -22,7 +22,7 @@ fi
echo "Using dart from $HOST_TOOLS, gen_snapshot from $DEVICE_TOOLS."
OUTDIR="build/ios"
OUTDIR="${BASH_SOURCE%/*}/build/ios"
echo "Creating $OUTDIR..."
@ -36,7 +36,7 @@ echo "Compiling kernel..."
--sdk-root "$HOST_TOOLS/flutter_patched_sdk" \
--aot --tfa --target=flutter \
--output-dill "$OUTDIR/app.dill" \
lib/main.dart
"${BASH_SOURCE%/*}/lib/main.dart"
echo "Compiling AOT Assembly..."
@ -65,12 +65,12 @@ clang -arch arm64 \
strip "$OUTDIR/App.framework/App"
cp ios/AppFrameworkInfo.plist "$OUTDIR/App.framework/Info.plist"
cp "${BASH_SOURCE%/*}/ios/AppFrameworkInfo.plist" "$OUTDIR/App.framework/Info.plist"
echo "Created $OUTDIR/App.framework/App."
rm -rf ios/Scenarios/App.framework
rm -rf ios/Scenarios/Flutter.framework
cp -R "$OUTDIR/App.framework" ios/Scenarios
cp -R "$DEVICE_TOOLS/../Flutter.framework" ios/Scenarios
rm -rf "${BASH_SOURCE%/*}/ios/Scenarios/App.framework"
rm -rf "${BASH_SOURCE%/*}/ios/Scenarios/Flutter.framework"
cp -R "$OUTDIR/App.framework" "${BASH_SOURCE%/*}/ios/Scenarios"
cp -R "$DEVICE_TOOLS/../Flutter.framework" "${BASH_SOURCE%/*}/ios/Scenarios"

View File

@ -0,0 +1,81 @@
#!/bin/bash
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#TODO(dnfield): Get rid of this script and instead use proper build rules
set -e
HOST_TOOLS=$1
DEVICE_TOOLS=$2
if [[ ! -d "$HOST_TOOLS" ]]; then
echo "Must specify the host out directory containing dart."
exit 1
fi
if [[ ! -d "$DEVICE_TOOLS" ]]; then
echo "Must specify the device out directory containing gen_snapshot."
exit 1
fi
echo "Using dart from $HOST_TOOLS, gen_snapshot from $DEVICE_TOOLS."
OUTDIR="${BASH_SOURCE%/*}/build/ios"
echo "Creating $OUTDIR..."
mkdir -p "$OUTDIR"
mkdir -p "$OUTDIR/App.framework/flutter_assets"
echo "Compiling to kernel..."
"$HOST_TOOLS/dart" \
"$HOST_TOOLS/gen/frontend_server.dart.snapshot" \
--sdk-root "$HOST_TOOLS/flutter_patched_sdk" \
--strong --target=flutter \
--no-link-platform \
--output-dill "$OUTDIR/App.framework/flutter_assets/kernel_blob.bin" \
"${BASH_SOURCE%/*}/lib/main.dart"
echo "Compiling JIT Snapshot..."
"$DEVICE_TOOLS/gen_snapshot" --deterministic \
--enable-asserts \
--causal_async_stacks \
--isolate_snapshot_instructions="$OUTDIR/isolate_snapshot_instr" \
--snapshot_kind=app-jit \
--load_vm_snapshot_data="$DEVICE_TOOLS/../gen/flutter/lib/snapshot/vm_isolate_snapshot.bin" \
--load_isolate_snapshot_data="$DEVICE_TOOLS/../gen/flutter/lib/snapshot/isolate_snapshot.bin" \
--isolate_snapshot_data="$OUTDIR/App.framework/flutter_assets/isolate_snapshot_data" \
--isolate_snapshot_instructions="$OUTDIR/App.framework/flutter_assets/isolate_snapshot_instr" \
"$OUTDIR/App.framework/flutter_assets/kernel_blob.bin"
cp "$DEVICE_TOOLS/../gen/flutter/lib/snapshot/vm_isolate_snapshot.bin" "$OUTDIR/App.framework/flutter_assets/vm_snapshot_data"
SYSROOT=$(xcrun --sdk iphonesimulator --show-sdk-path)
echo "Using $SYSROOT as sysroot."
echo "Creating stub App using $SYSROOT..."
echo "static const int Moo = 88;" | xcrun clang -x c \
-arch x86_64 \
-isysroot "$SYSROOT" \
-miphoneos-version-min=8.0 \
-dynamiclib \
-Xlinker -rpath -Xlinker '@executable_path/Frameworks' \
-Xlinker -rpath -Xlinker '@loader_path/Frameworks' \
-install_name '@rpath/App.framework/App' \
-o "$OUTDIR/App.framework/App" -
strip "$OUTDIR/App.framework/App"
cp "${BASH_SOURCE%/*}/ios/AppFrameworkInfo.plist" "$OUTDIR/App.framework/Info.plist"
echo "Created $OUTDIR/App.framework/App."
rm -rf "${BASH_SOURCE%/*}/ios/Scenarios/App.framework"
rm -rf "${BASH_SOURCE%/*}/ios/Scenarios/Flutter.framework"
cp -R "$OUTDIR/App.framework" "${BASH_SOURCE%/*}/ios/Scenarios"
cp -R "$DEVICE_TOOLS/../Flutter.framework" "${BASH_SOURCE%/*}/ios/Scenarios"