diff options
| author | 2024-03-06 23:55:06 +0000 | |
|---|---|---|
| committer | 2024-03-06 23:55:06 +0000 | |
| commit | c1b8344e51850cf76d9876a45f491061d36fdca2 (patch) | |
| tree | e468508014c178be0de8baf57a2ec7c5b11fb833 /libnativeloader/native_loader_test.cpp | |
| parent | 9da5bba7cfd85ae32a207b190789af4b2c1aa06e (diff) | |
| parent | c831818b6caa483fd84e3abfd15cc0f3f3a93012 (diff) | |
Check if product is treblelized am: c831818b6c
Original change: https://android-review.googlesource.com/c/platform/art/+/2981553
Change-Id: Iba23606b4ec6043f6ab8f35677c155be3bdfa4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libnativeloader/native_loader_test.cpp')
| -rw-r--r-- | libnativeloader/native_loader_test.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index 62fb1eef2b..547fded4b4 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -18,9 +18,9 @@ #include "native_loader_test.h" -#include <dlfcn.h> - +#include <android-base/properties.h> #include <android-base/strings.h> +#include <dlfcn.h> #include <gtest/gtest.h> #include "nativehelper/scoped_utf_chars.h" @@ -378,13 +378,16 @@ TEST_P(NativeLoaderTest_Create, UnbundledProductApp) { dex_path = "/product/app/foo/foo.apk"; is_shared = false; - expected_namespace_prefix = "product-clns"; - expected_library_path = expected_library_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; - expected_permitted_path = - expected_permitted_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; - expected_shared_libs_to_platform_ns = - append_extended_libraries(default_public_libraries() + ":" + llndk_libraries_product()); - expected_link_with_vndk_product_ns = true; + if (is_product_treblelized()) { + expected_namespace_prefix = "product-clns"; + expected_library_path = + expected_library_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; + expected_permitted_path = + expected_permitted_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; + expected_shared_libs_to_platform_ns = + append_extended_libraries(default_public_libraries() + ":" + llndk_libraries_product()); + expected_link_with_vndk_product_ns = true; + } SetExpectations(); RunTest(); |