Skip to content

Commit 4a2d7af

Browse files
authored
🧹 Refactor Skia build scripts
2 parents 25476d4 + 9309027 commit 4a2d7af

12 files changed

+259
-382
lines changed

‎packages/skia/android/cpp/jni/include/JniSkiaBaseView.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class JniSkiaBaseView {
2929
}
3030

3131
protected:
32-
3332
virtual void surfaceAvailable(jobject surface, int width, int height) {
3433
_skiaAndroidView->surfaceAvailable(surface, width, height);
3534
}

‎packages/skia/android/cpp/jni/include/JniSkiaPictureView.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ class JniSkiaPictureView : public jni::HybridClass<JniSkiaPictureView>,
4949
}
5050

5151
protected:
52-
5352
void surfaceAvailable(jobject surface, int width, int height) override {
5453
JniSkiaBaseView::surfaceAvailable(surface, width, height);
5554
}

‎packages/skia/package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@
4141
"e2e": "E2E=true yarn test -i e2e",
4242
"release": "semantic-release",
4343
"build": "bob build && merge-dirs lib/typescript/src lib/commonjs && merge-dirs lib/typescript/src lib/module",
44-
"build-skia-ios-framework": "ts-node ./scripts/build-skia-ios-framework.ts",
45-
"build-skia-ios": "ts-node ./scripts/build-skia-ios.ts && yarn build-skia-ios-framework",
46-
"build-skia-android": "ts-node ./scripts/build-skia-android.ts",
4744
"clean-skia": "yarn rimraf ./libs && yarn rimraf ../../externals/skia/out",
48-
"copy-skia-headers": "ts-node ./scripts/copy-skia-module-headers.ts",
49-
"build-skia": "yarn rimraf ./libs && yarn build-skia-ios && yarn build-skia-android && yarn copy-skia-headers",
45+
"build-skia": "ts-node ./scripts/build-skia.ts",
46+
"copy-skia-headers": "ts-node ./scripts/copy-skia-headers.ts",
5047
"clang-format": "yarn clang-format-ios && yarn clang-format-android && yarn clang-format-common",
5148
"clang-format-ios": "find ios/ -iname '*.h' -o -iname '*.mm' -o -iname '*.cpp' | xargs clang-format -i",
5249
"clang-format-android": "find android/cpp/ -iname '*.h' -o -iname '*.m' -o -iname '*.cpp' | xargs clang-format -i",

‎packages/skia/scripts/build-skia-android.ts

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎packages/skia/scripts/build-skia-ios-framework.ts

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎packages/skia/scripts/build-skia-ios.ts

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)