Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65a97364 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Generate NDK stubs for riscv64 too."

parents 071c76e2 f7d31099

android/arch.go

+1 −0
Original line number Diff line number Diff line
@@ -1694,6 +1694,7 @@ func getNdkAbisConfig() []archConfig { 
	return []archConfig{

		{"arm64", "armv8-a-branchprot", "", []string{"arm64-v8a"}},

		{"arm", "armv7-a-neon", "", []string{"armeabi-v7a"}},

		{"riscv64", "", "", []string{"riscv64"}},

		{"x86_64", "", "", []string{"x86_64"}},

		{"x86", "", "", []string{"x86"}},

	}

scripts/build-ndk-prebuilts.sh

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ if [ -z "${OUT_DIR}" ]; then 
    exit 1

fi



# TODO: remove this when all the riscv64 dependencies exist (currently blocked by

# http://b/273792258).

ALLOW_MISSING_DEPENDENCIES=true \

    TARGET_PRODUCT=ndk build/soong/soong_ui.bash --make-mode --soong-only ${OUT_DIR}/soong/ndk.timestamp



if [ -n "${DIST_DIR}" ]; then