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

Commit 8d2e14a6 authored by Ken Chen's avatar Ken Chen Committed by Gerrit Code Review
Browse files

Merge "Find out whether the system is 32-bit or 64-bit by reading "ro.product.cpu.abi"." into main

parents a064114d 06c96195

tests/resolv_test_utils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -229,3 +229,7 @@ void RemoveMdnsRoute() { 
    };

    EXPECT_EQ(0, ForkAndRun(args_v6));

}



bool is64bitAbi() {

    return android::base::GetProperty("ro.product.cpu.abi", "").find("64") != std::string::npos;

}

tests/resolv_test_utils.h

+4 −3
Original line number Diff line number Diff line
@@ -439,9 +439,10 @@ void RemoveMdnsRoute(); 
        }                                                                        \

    } while (0)



bool is64bitAbi();



static const std::string DNS_HELPER =

        android::bpf::isUserspace64bit()

                ? "/apex/com.android.tethering/lib64/libcom.android.tethering.dns_helper.so"

        is64bitAbi() ? "/apex/com.android.tethering/lib64/libcom.android.tethering.dns_helper.so"

                     : "/apex/com.android.tethering/lib/libcom.android.tethering.dns_helper.so";



#define SKIP_IF_DEPENDENT_LIB_DOES_NOT_EXIST(libPath)                  \