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

Commit c0e3ed3c authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Use llndk.libraries.txt from system if VNDK is deprecated 

llndk.libraries.txt will be relocated into system when VNDK is
deprecated. This change sets a new location to load llndk.libraries.txt
when VNDK is deprecated.

Bug: 290160925
Test: aosp_cf build and boot succeeded with llndk.libraries.txt in the
system image

Change-Id: I3022910a4e2c9852e2dfe520e1a6e06a9de21f76
parent 06687f65

libs/graphicsenv/GraphicsEnv.cpp

+21 −2
Original line number Diff line number Diff line
@@ -60,6 +60,17 @@ typedef bool (*fpANGLEShouldBeUsedForApplication)(void* rulesHandle, int rulesVe 
typedef bool (*fpANGLEFreeRulesHandle)(void* handle);

typedef bool (*fpANGLEFreeSystemInfoHandle)(void* handle);



namespace {

static bool isVndkEnabled() {

#ifdef __BIONIC__

    // TODO(b/290159430) Use ro.vndk.version to check if VNDK is enabled instead

    static bool isVndkEnabled = !android::base::GetBoolProperty("ro.vndk.deprecate", false);

    return isVndkEnabled;

#endif

    return false;

}

} // namespace



namespace android {



enum NativeLibrary {
@@ -71,6 +82,8 @@ static constexpr const char* kNativeLibrariesSystemConfigPath[] = 
        {"/apex/com.android.vndk.v{}/etc/llndk.libraries.{}.txt",

         "/apex/com.android.vndk.v{}/etc/vndksp.libraries.{}.txt"};



static const char* kLlndkLibrariesTxtPath = "/system/etc/llndk.libraries.txt";



static std::string vndkVersionStr() {

#ifdef __BIONIC__

    return base::GetProperty("ro.vndk.version", "");
@@ -108,8 +121,14 @@ static bool readConfig(const std::string& configFile, std::vector<std::string>* 
}



static const std::string getSystemNativeLibraries(NativeLibrary type) {

    std::string nativeLibrariesSystemConfig = kNativeLibrariesSystemConfigPath[type];

    std::string nativeLibrariesSystemConfig = "";



    if (!isVndkEnabled() && type == NativeLibrary::LLNDK) {

        nativeLibrariesSystemConfig = kLlndkLibrariesTxtPath;

    } else {

        nativeLibrariesSystemConfig = kNativeLibrariesSystemConfigPath[type];

        insertVndkVersionStr(&nativeLibrariesSystemConfig);

    }



    std::vector<std::string> soNames;

    if (!readConfig(nativeLibrariesSystemConfig, &soNames)) {