Skip to content

Commit

Permalink
optimized
Browse files Browse the repository at this point in the history
  • Loading branch information
leleliu008 committed Nov 28, 2024
1 parent 2d340d9 commit 2c1767a
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions ndk-pkg
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,9 @@ EOF

unset RECEIPT_PACKAGE_PKGNAME
unset RECEIPT_PACKAGE_PKGTYPE

unset RECEIPT_PACKAGE_PROFILE

unset RECEIPT_PACKAGE_SUMMARY
unset RECEIPT_PACKAGE_VERSION
unset RECEIPT_PACKAGE_LICENSE
Expand Down Expand Up @@ -1547,6 +1550,9 @@ EOF

RECEIPT_PACKAGE_PKGNAME="$(yq '.pkgname | select(. != null)' "$PACKAGE_RECEIPT_FILEPATH")"
RECEIPT_PACKAGE_PKGTYPE="$(yq '.pkgtype | select(. != null)' "$PACKAGE_RECEIPT_FILEPATH")"

RECEIPT_PACKAGE_PROFILE="$(yq '.profile | select(. != null)' "$PACKAGE_RECEIPT_FILEPATH")"

RECEIPT_PACKAGE_SUMMARY="$(yq '.summary | select(. != null)' "$PACKAGE_RECEIPT_FILEPATH")"
RECEIPT_PACKAGE_LICENSE="$(yq '.license | select(. != null)' "$PACKAGE_RECEIPT_FILEPATH")"
RECEIPT_PACKAGE_VERSION="$(yq '.version | select(. != null)' "$PACKAGE_RECEIPT_FILEPATH")"
Expand Down Expand Up @@ -2640,6 +2646,8 @@ __fetch_resources_of_the_given_package() {
PACKED_DIR_NAME="${RECEIPT_PACKAGE_PKGNAME%@*}-$RECEIPT_PACKAGE_VERSION-$RECEIPT_PACKAGE_BUILTFOR_PLATFORM_NAME-$RECEIPT_PACKAGE_BUILTFOR_PLATFORM_ARCH"
fi

PACKED_DIR_NAME="$PACKED_DIR_NAME.$RECEIPT_PACKAGE_PROFILE"

###########################################################################################

if [ -z "$OUTPUT_TYPE" ] ; then
Expand Down Expand Up @@ -8681,13 +8689,6 @@ EOF
uppm install "$ANDROID_NDK_PKG"

case $NATIVE_PLATFORM_KIND in
linux)
# https://github.com/microsoft/WSL/issues/8681
# https://github.com/microsoft/WSL/issues/4071
if grep -q -i Microsoft /proc/version ; then
patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/clang-17"
fi
;;
darwin)
# https://github.com/android/ndk/issues/1549
# remove the yasm shipped with Android NDK and use our own
Expand Down Expand Up @@ -9659,7 +9660,7 @@ fi
fi
}

NDKPKG_VERSION=0.19.1
NDKPKG_VERSION=0.19.2

NDKPKG_ARG0="$0"
NDKPKG_ARG1="$1"
Expand Down

0 comments on commit 2c1767a

Please sign in to comment.