diff options
author | Martin Stjernholm <mast@google.com> | 2019-10-17 21:29:01 +0100 |
---|---|---|
committer | Treehugger Robot <treehugger-gerrit@google.com> | 2019-10-21 14:34:02 +0000 |
commit | 3bb009ac148d6e1978d9233b0131a027585752f7 (patch) | |
tree | f5177cffa33c1e6479a04d438cce937306ad8dfe /libnativeloader/library_namespaces.cpp | |
parent | e41eec3b193d594577cbe8afc7c3dc6608c2f201 (diff) |
Use art_defaults in libnative*, for consistency.
Also change to //art:__submodules__ for consistent internal visibility, and
some TODO comment corrections.
Test: m WITH_TIDY=1
Test: build & boot
Test: atest art/libnativeloader/test (no new errors, but existing ones on arm64 - b/142896688)
Test: (atest art/libnativebridge/tests doesn't work at all, but that's not new - b/142897320)
Bug: 137364733
Bug: 133140750
Change-Id: If9ddb5a597eea3606342c3625dcdb3bcf5d19041
Diffstat (limited to 'libnativeloader/library_namespaces.cpp')
-rw-r--r-- | libnativeloader/library_namespaces.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp index 7246b97642..ef979591c0 100644 --- a/libnativeloader/library_namespaces.cpp +++ b/libnativeloader/library_namespaces.cpp @@ -33,8 +33,6 @@ #include "public_libraries.h" #include "utils.h" -using android::base::Error; - namespace android::nativeloader { namespace { @@ -71,11 +69,11 @@ const std::regex kVendorDexPathRegex("(^|:)/vendor/"); const std::regex kProductDexPathRegex("(^|:)(/system)?/product/"); // Define origin of APK if it is from vendor partition or product partition -typedef enum { +using ApkOrigin = enum { APK_ORIGIN_DEFAULT = 0, APK_ORIGIN_VENDOR = 1, APK_ORIGIN_PRODUCT = 2, -} ApkOrigin; +}; jobject GetParentClassLoader(JNIEnv* env, jobject class_loader) { jclass class_loader_class = env->FindClass("java/lang/ClassLoader"); |