diff --git a/third-party/mozjpeg/BUCK b/third-party/mozjpeg/BUCK index e29dd4d348..379603ce42 100644 --- a/third-party/mozjpeg/BUCK +++ b/third-party/mozjpeg/BUCK @@ -23,16 +23,18 @@ genrule( """ set -ex - BUILD_ARCH="arm64" - mkdir -p "$OUT" + mkdir -p "$OUT/Public/mozjpeg" + mkdir -p "$OUT/Public/lib" + + CMAKE_DIR="$(location //third-party/cmake:cmake)/cmake-3.16.0" + + BUILD_ARCH="arm64" BUILD_DIR="$OUT/$BUILD_ARCH" rm -rf "$BUILD_DIR" mkdir -p "$BUILD_DIR" - CMAKE_DIR="$(location //third-party/cmake:cmake)/cmake-3.16.0" - cp "$SRCDIR/build-mozjpeg-buck.sh" "$BUILD_DIR/" cp -R "$SRCDIR/mozjpeg" "$BUILD_DIR/" @@ -41,17 +43,27 @@ genrule( PATH="$PATH:$CMAKE_DIR/bin" sh $BUILD_DIR/build-mozjpeg-buck.sh $BUILD_ARCH "$BUILD_DIR/mozjpeg" "$BUILD_DIR" - mkdir -p $OUT/Public/mozjpeg - mkdir -p $OUT/Public/lib - cp $BUILD_DIR/mozjpeg/turbojpeg.h "$OUT/Public/mozjpeg/" cp $BUILD_DIR/mozjpeg/jpeglib.h "$OUT/Public/mozjpeg/" cp $BUILD_DIR/mozjpeg/jmorecfg.h "$OUT/Public/mozjpeg/" cp $BUILD_DIR/build/jconfig.h "$OUT/Public/mozjpeg/" - cp $BUILD_DIR/build/libjpeg.a "$OUT/Public/lib/" - cp $BUILD_DIR/build/libturbojpeg.a "$OUT/Public/lib/" + BUILD_ARCH="armv7" + BUILD_DIR="$OUT/$BUILD_ARCH" + rm -rf "$BUILD_DIR" + mkdir -p "$BUILD_DIR" + + cp "$SRCDIR/build-mozjpeg-buck.sh" "$BUILD_DIR/" + + cp -R "$SRCDIR/mozjpeg" "$BUILD_DIR/" + + mkdir -p "$BUILD_DIR/Public/mozjpeg" + + PATH="$PATH:$CMAKE_DIR/bin" sh $BUILD_DIR/build-mozjpeg-buck.sh $BUILD_ARCH "$BUILD_DIR/mozjpeg" "$BUILD_DIR" + + lipo -create $OUT/arm64/build/libjpeg.a $OUT/armv7/build/libjpeg.a -output $OUT/Public/lib/libjpeg.a + lipo -create $OUT/arm64/build/libturbojpeg.a $OUT/armv7/build/libturbojpeg.a -output $OUT/Public/lib/libturbojpeg.a """, out = "libmozjpeg", visibility = [