diff options
| -rw-r--r-- | adb/adb.cpp | 5 | ||||
| -rw-r--r-- | adb/adb.h | 9 | ||||
| -rw-r--r-- | adb/transport.cpp | 11 | ||||
| -rw-r--r-- | adb/transport.h | 5 | ||||
| -rw-r--r-- | adb/transport_local.cpp | 5 | ||||
| -rw-r--r-- | adb/transport_usb.cpp | 9 | ||||
| -rw-r--r-- | libziparchive/zip_archive_benchmark.cpp | 2 | ||||
| -rw-r--r-- | property_service/libpropertyinfoparser/property_info_parser.cpp | 1 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.legacy.txt | 13 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.txt | 230 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.txt.in | 197 |
11 files changed, 394 insertions, 93 deletions
diff --git a/adb/adb.cpp b/adb/adb.cpp index 6b30be884..0e3889762 100644 --- a/adb/adb.cpp +++ b/adb/adb.cpp @@ -240,7 +240,10 @@ void send_connect(atransport* t) { D("Calling send_connect"); apacket* cp = get_apacket(); cp->msg.command = A_CNXN; - cp->msg.arg0 = t->get_protocol_version(); + // Send the max supported version, but because the transport is + // initialized to A_VERSION_MIN, this will be compatible with every + // device. + cp->msg.arg0 = A_VERSION; cp->msg.arg1 = t->get_max_payload(); std::string connection_str = get_connection_string(); @@ -44,7 +44,12 @@ constexpr size_t LINUX_MAX_SOCKET_SIZE = 4194304; #define A_AUTH 0x48545541 // ADB protocol version. -#define A_VERSION 0x01000000 +// Version revision: +// 0x01000000: original +// 0x01000001: skip checksum (Dec 2017) +#define A_VERSION_MIN 0x01000000 +#define A_VERSION_SKIP_CHECKSUM 0x01000001 +#define A_VERSION 0x01000001 // Used for help/version information. #define ADB_VERSION_MAJOR 1 @@ -53,7 +58,7 @@ constexpr size_t LINUX_MAX_SOCKET_SIZE = 4194304; std::string adb_version(); // Increment this when we want to force users to start a new adb server. -#define ADB_SERVER_VERSION 39 +#define ADB_SERVER_VERSION 40 using TransportId = uint64_t; class atransport; diff --git a/adb/transport.cpp b/adb/transport.cpp index 089a1ecf4..5cf2450a6 100644 --- a/adb/transport.cpp +++ b/adb/transport.cpp @@ -163,7 +163,12 @@ static void transport_socket_events(int fd, unsigned events, void* _t) { void send_packet(apacket* p, atransport* t) { p->msg.magic = p->msg.command ^ 0xffffffff; - p->msg.data_check = calculate_apacket_checksum(p); + // compute a checksum for connection/auth packets for compatibility reasons + if (t->get_protocol_version() >= A_VERSION_SKIP_CHECKSUM) { + p->msg.data_check = 0; + } else { + p->msg.data_check = calculate_apacket_checksum(p); + } print_packet("send", p); @@ -1089,10 +1094,6 @@ bool check_header(apacket* p, atransport* t) { return true; } -bool check_data(apacket* p) { - return calculate_apacket_checksum(p) == p->msg.data_check; -} - #if ADB_HOST std::shared_ptr<RSA> atransport::NextKey() { if (keys_.empty()) keys_ = adb_auth_get_private_keys(); diff --git a/adb/transport.h b/adb/transport.h index 8c101fdc5..86cd9928c 100644 --- a/adb/transport.h +++ b/adb/transport.h @@ -66,7 +66,9 @@ class atransport { atransport(ConnectionState state = kCsOffline) : id(NextTransportId()), connection_state_(state) { transport_fde = {}; - protocol_version = A_VERSION; + // Initialize protocol to min version for compatibility with older versions. + // Version will be updated post-connect. + protocol_version = A_VERSION_MIN; max_payload = MAX_PAYLOAD; } virtual ~atransport() {} @@ -223,7 +225,6 @@ int register_socket_transport(int s, const char* serial, int port, int local); void unregister_usb_transport(usb_handle* usb); bool check_header(apacket* p, atransport* t); -bool check_data(apacket* p); void close_usb_devices(); void close_usb_devices(std::function<bool(const atransport*)> predicate); diff --git a/adb/transport_local.cpp b/adb/transport_local.cpp index 9cd378cad..d6c84dac5 100644 --- a/adb/transport_local.cpp +++ b/adb/transport_local.cpp @@ -77,11 +77,6 @@ static int remote_read(apacket *p, atransport *t) return -1; } - if (!check_data(p)) { - D("bad data: terminated (data)"); - return -1; - } - return 0; } diff --git a/adb/transport_usb.cpp b/adb/transport_usb.cpp index c3ac34479..347482016 100644 --- a/adb/transport_usb.cpp +++ b/adb/transport_usb.cpp @@ -109,10 +109,6 @@ static int remote_read(apacket* p, atransport* t) { goto err_msg; } } - if (!check_data(p)) { - D("remote usb: check_data failed, skip it"); - goto err_msg; - } return 0; err_msg: @@ -143,11 +139,6 @@ static int remote_read(apacket *p, atransport *t) } } - if (!check_data(p)) { - LOG(ERROR) << "remote usb: check_data failed"; - return -1; - } - return 0; } #endif diff --git a/libziparchive/zip_archive_benchmark.cpp b/libziparchive/zip_archive_benchmark.cpp index cd3e16489..46aa5a68f 100644 --- a/libziparchive/zip_archive_benchmark.cpp +++ b/libziparchive/zip_archive_benchmark.cpp @@ -84,4 +84,4 @@ static void Iterate_all_files(benchmark::State& state) { } BENCHMARK(Iterate_all_files); -BENCHMARK_MAIN() +BENCHMARK_MAIN(); diff --git a/property_service/libpropertyinfoparser/property_info_parser.cpp b/property_service/libpropertyinfoparser/property_info_parser.cpp index 89864dd78..e53c6253e 100644 --- a/property_service/libpropertyinfoparser/property_info_parser.cpp +++ b/property_service/libpropertyinfoparser/property_info_parser.cpp @@ -21,6 +21,7 @@ #include <sys/mman.h> #include <sys/stat.h> #include <sys/types.h> +#include <unistd.h> namespace android { namespace properties { diff --git a/rootdir/etc/ld.config.legacy.txt b/rootdir/etc/ld.config.legacy.txt index 4d058db4e..d55ec57cc 100644 --- a/rootdir/etc/ld.config.legacy.txt +++ b/rootdir/etc/ld.config.legacy.txt @@ -12,5 +12,14 @@ dir.legacy = /sbin [legacy] namespace.default.isolated = false -namespace.default.search.paths = /system/${LIB}:/vendor/${LIB}:/odm/${LIB} -namespace.default.asan.search.paths = /data/asan/system/${LIB}:/system/${LIB}:/data/asan/odm/${LIB}:/odm/${LIB}:/data/asan/vendor/${LIB}:/vendor/${LIB} + +namespace.default.search.paths = /system/${LIB} +namespace.default.search.paths += /vendor/${LIB} +namespace.default.search.paths += /odm/${LIB} + +namespace.default.asan.search.paths = /data/asan/system/${LIB} +namespace.default.asan.search.paths += /system/${LIB} +namespace.default.asan.search.paths += /data/asan/odm/${LIB} +namespace.default.asan.search.paths += /odm/${LIB} +namespace.default.asan.search.paths += /data/asan/vendor/${LIB} +namespace.default.asan.search.paths += /vendor/${LIB} diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 2cba1e374..60afdd7a2 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -3,9 +3,11 @@ # Bionic loader config file. # -# Don't change the order here. +# Don't change the order here. The first pattern that matches with the +# absolute path of an executable is selected. dir.system = /system/bin/ dir.system = /system/xbin/ + dir.vendor = /odm/bin/ dir.vendor = /vendor/bin/ dir.vendor = /data/nativetest/odm @@ -16,6 +18,7 @@ dir.vendor = /data/nativetest/vendor dir.vendor = /data/nativetest64/vendor dir.vendor = /data/benchmarktest/vendor dir.vendor = /data/benchmarktest64/vendor + dir.system = /data/nativetest dir.system = /data/nativetest64 dir.system = /data/benchmarktest @@ -27,25 +30,21 @@ additional.namespaces = sphal,vndk,rs ############################################################################### # "default" namespace # -# Framework-side code runs in this namespace. Anything from /vendor partition -# can't be loaded in this namespace. +# Framework-side code runs in this namespace. However, libs from other +# partitions are also allowed temporarily. ############################################################################### namespace.default.isolated = false -namespace.default.search.paths = /system/${LIB}:/odm/${LIB}:/vendor/${LIB} -namespace.default.permitted.paths = /system/${LIB}:/odm/${LIB}:/vendor/${LIB} - -namespace.default.asan.search.paths = /data/asan/system/${LIB}:/system/${LIB}:/data/asan/vendor/${LIB}:/vendor/${LIB} -namespace.default.asan.permitted.paths = /data/asan/system/${LIB}:/system/${LIB}:/data/asan/vendor/${LIB}:/vendor/${LIB} - -# TODO(b/37013858): remove all dependencies to /vendor/lib from system processes -# When this is done, comment out following three lines and remove the three -# lines above -#namespace.default.isolated = true -#namespace.default.search.paths = /system/${LIB} -#namespace.default.permitted.paths = /system/${LIB} -# -#namespace.default.asan.search.paths = /data/asan/system/${LIB}:/system/${LIB} -#namespace.default.asan.permitted.paths = /data/asan/system/${LIB}:/system/${LIB} + +namespace.default.search.paths = /system/${LIB} +namespace.default.search.paths += /odm/${LIB} +namespace.default.search.paths += /vendor/${LIB} + +namespace.default.asan.search.paths = /data/asan/system/${LIB} +namespace.default.asan.search.paths += /system/${LIB} +namespace.default.asan.search.paths += /data/asan/odm/${LIB} +namespace.default.asan.search.paths += /odm/${LIB} +namespace.default.asan.search.paths += /data/asan/vendor/${LIB} +namespace.default.asan.search.paths += /vendor/${LIB} ############################################################################### # "sphal" namespace @@ -62,21 +61,56 @@ namespace.default.asan.permitted.paths = /data/asan/system/${LIB}:/system/${LIB} ############################################################################### namespace.sphal.isolated = true namespace.sphal.visible = true -namespace.sphal.search.paths = /vendor/${LIB}/egl:/vendor/${LIB}/hw:/vendor/${LIB} -namespace.sphal.permitted.paths = /vendor/${LIB}:/system/${LIB}/vndk-sp${VNDK_VER}/hw -namespace.sphal.asan.search.paths = /data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl:/data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}:/vendor/${LIB} -namespace.sphal.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB} +namespace.sphal.search.paths = /odm/${LIB} +namespace.sphal.search.paths += /vendor/${LIB} + +namespace.sphal.permitted.paths = /odm/${LIB} +namespace.sphal.permitted.paths += /vendor/${LIB} + +namespace.sphal.asan.search.paths = /data/asan/odm/${LIB} +namespace.sphal.asan.search.paths += /odm/${LIB} +namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB} +namespace.sphal.asan.search.paths += /vendor/${LIB} + +namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB} +namespace.sphal.asan.permitted.paths += /odm/${LIB} +namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} +namespace.sphal.asan.permitted.paths += /vendor/${LIB} # Once in this namespace, access to libraries in /system/lib is restricted. Only # libs listed here can be used. namespace.sphal.links = default,vndk,rs # WARNING: only NDK libs can be listed here. -namespace.sphal.link.default.shared_libs = libc.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libGLESv1_CM.so:libGLESv2.so:libvndksupport.so:libz.so +namespace.sphal.link.default.shared_libs = libc.so +namespace.sphal.link.default.shared_libs += libEGL.so +namespace.sphal.link.default.shared_libs += libGLESv1_CM.so +namespace.sphal.link.default.shared_libs += libGLESv2.so +namespace.sphal.link.default.shared_libs += libdl.so +namespace.sphal.link.default.shared_libs += liblog.so +namespace.sphal.link.default.shared_libs += libm.so +namespace.sphal.link.default.shared_libs += libnativewindow.so +namespace.sphal.link.default.shared_libs += libstdc++.so +namespace.sphal.link.default.shared_libs += libsync.so +namespace.sphal.link.default.shared_libs += libvndksupport.so +namespace.sphal.link.default.shared_libs += libz.so # WARNING: only VNDK-SP libs can be listed here. DO NOT EDIT this line. -namespace.sphal.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.memory@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libion.so:libutils.so:libc++.so +namespace.sphal.link.vndk.shared_libs = android.hardware.renderscript@1.0.so +namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.0.so +namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so +namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so +namespace.sphal.link.vndk.shared_libs += libbase.so +namespace.sphal.link.vndk.shared_libs += libc++.so +namespace.sphal.link.vndk.shared_libs += libcutils.so +namespace.sphal.link.vndk.shared_libs += libhardware.so +namespace.sphal.link.vndk.shared_libs += libhidlbase.so +namespace.sphal.link.vndk.shared_libs += libhidlmemory.so +namespace.sphal.link.vndk.shared_libs += libhidltransport.so +namespace.sphal.link.vndk.shared_libs += libhwbinder.so +namespace.sphal.link.vndk.shared_libs += libion.so +namespace.sphal.link.vndk.shared_libs += libutils.so # Renderscript gets separate namespace namespace.sphal.link.rs.shared_libs = libRS_internal.so @@ -91,15 +125,68 @@ namespace.sphal.link.rs.shared_libs = libRS_internal.so ############################################################################### namespace.rs.isolated = true namespace.rs.visible = true -namespace.rs.search.paths = /vendor/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER}:/vendor/${LIB} -namespace.rs.permitted.paths = /vendor/${LIB}:/data -namespace.rs.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}:/vendor/${LIB}/vndk-sp${VNDK_VER}:/data/asan/system/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER}:/data/asan/vendor/${LIB}:/vendor/${LIB} -namespace.rs.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB}:/data +namespace.rs.search.paths = /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.search.paths += /odm/${LIB} +namespace.rs.search.paths += /vendor/${LIB} + +namespace.rs.permitted.paths = /odm/${LIB} +namespace.rs.permitted.paths += /vendor/${LIB} +namespace.rs.permitted.paths += /data + +namespace.rs.asan.search.paths = /data/asan/odm/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /data/asan/odm/${LIB} +namespace.rs.asan.search.paths += /odm/${LIB} +namespace.rs.asan.search.paths += /data/asan/vendor/${LIB} +namespace.rs.asan.search.paths += /vendor/${LIB} + +namespace.rs.asan.permitted.paths = /data/asan/odm/${LIB} +namespace.rs.asan.permitted.paths += /odm/${LIB} +namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} +namespace.rs.asan.permitted.paths += /vendor/${LIB} +namespace.rs.asan.permitted.paths += /data namespace.rs.links = default,vndk -namespace.rs.link.default.shared_libs = libc.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libGLESv1_CM.so:libGLESv2.so:libmediandk.so:libvndksupport.so:libz.so:libft2.so -namespace.rs.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.memory@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libion.so:libutils.so:libc++.so + +namespace.rs.link.default.shared_libs = libc.so +namespace.rs.link.default.shared_libs += libEGL.so +namespace.rs.link.default.shared_libs += libGLESv1_CM.so +namespace.rs.link.default.shared_libs += libGLESv2.so +namespace.rs.link.default.shared_libs += libdl.so +namespace.rs.link.default.shared_libs += liblog.so +namespace.rs.link.default.shared_libs += libm.so +namespace.rs.link.default.shared_libs += libnativewindow.so +namespace.rs.link.default.shared_libs += libstdc++.so +namespace.rs.link.default.shared_libs += libsync.so +namespace.rs.link.default.shared_libs += libvndksupport.so +namespace.rs.link.default.shared_libs += libz.so +# These two libs are private LLNDK libs but are exceptionally visible +# in this 'rs' namespace because RenderScript framework libraries +# which are loaded into this namespace are using them. +namespace.rs.link.default.shared_libs += libft2.so +namespace.rs.link.default.shared_libs += libmediandk.so + +namespace.rs.link.vndk.shared_libs = android.hardware.renderscript@1.0.so +namespace.rs.link.vndk.shared_libs += android.hardware.graphics.common@1.0.so +namespace.rs.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so +namespace.rs.link.vndk.shared_libs += android.hidl.memory@1.0.so +namespace.rs.link.vndk.shared_libs += libbase.so +namespace.rs.link.vndk.shared_libs += libc++.so +namespace.rs.link.vndk.shared_libs += libcutils.so +namespace.rs.link.vndk.shared_libs += libhardware.so +namespace.rs.link.vndk.shared_libs += libhidlbase.so +namespace.rs.link.vndk.shared_libs += libhidlmemory.so +namespace.rs.link.vndk.shared_libs += libhidltransport.so +namespace.rs.link.vndk.shared_libs += libhwbinder.so +namespace.rs.link.vndk.shared_libs += libion.so +namespace.rs.link.vndk.shared_libs += libutils.so ############################################################################### # "vndk" namespace @@ -108,17 +195,47 @@ namespace.rs.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:androi ############################################################################### namespace.vndk.isolated = true namespace.vndk.visible = true -namespace.vndk.search.paths = /vendor/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER} -namespace.vndk.permitted.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl -namespace.vndk.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}:/vendor/${LIB}/vndk-sp${VNDK_VER}:/data/asan/system/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER} -namespace.vndk.asan.permitted.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl +namespace.vndk.search.paths = /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} + +namespace.vndk.permitted.paths = /odm/${LIB}/hw +namespace.vndk.permitted.paths += /odm/${LIB}/egl +namespace.vndk.permitted.paths += /vendor/${LIB}/hw +namespace.vndk.permitted.paths += /vendor/${LIB}/egl + +namespace.vndk.asan.search.paths = /data/asan/odm/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.asan.search.paths += /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.asan.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} + +namespace.vndk.asan.permitted.paths = /data/asan/odm/${LIB}/hw +namespace.vndk.asan.permitted.paths += /odm/${LIB}/hw +namespace.vndk.asan.permitted.paths += /data/asan/odm/${LIB}/egl +namespace.vndk.asan.permitted.paths += /odm/${LIB}/egl +namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/hw +namespace.vndk.asan.permitted.paths += /vendor/${LIB}/hw +namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl +namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl # When these NDK libs are required inside this namespace, then it is redirected # to the default namespace. This is possible since their ABI is stable across # Android releases. namespace.vndk.links = default -namespace.vndk.link.default.shared_libs = android.hidl.memory@1.0-impl.so:libc.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libvndksupport.so:libz.so +namespace.vndk.link.default.shared_libs = android.hidl.memory@1.0-impl.so +namespace.vndk.link.default.shared_libs += libEGL.so +namespace.vndk.link.default.shared_libs += libc.so +namespace.vndk.link.default.shared_libs += libdl.so +namespace.vndk.link.default.shared_libs += liblog.so +namespace.vndk.link.default.shared_libs += libm.so +namespace.vndk.link.default.shared_libs += libnativewindow.so +namespace.vndk.link.default.shared_libs += libstdc++.so +namespace.vndk.link.default.shared_libs += libsync.so +namespace.vndk.link.default.shared_libs += libvndksupport.so +namespace.vndk.link.default.shared_libs += libz.so ############################################################################### # Namespace config for vendor processes. In O, no restriction is enforced for @@ -128,6 +245,45 @@ namespace.vndk.link.default.shared_libs = android.hidl.memory@1.0-impl.so:libc.s ############################################################################### [vendor] namespace.default.isolated = false -namespace.default.search.paths = /odm/${LIB}/hw:/odm/${LIB}/egl:/odm/${LIB}:/vendor/${LIB}/hw:/vendor/${LIB}/egl:/vendor/${LIB}:/system/${LIB}/vndk${VNDK_VER}:/odm/${LIB}/vndk-sp${VNDK_VER}:/vendor/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB} -namespace.default.asan.search.paths = /data/asan/odm/${LIB}/hw:/odm/${LIB}/hw:/data/asan/odm/${LIB}/egl:/odm/${LIB}/egl:/data/asan/odm/${LIB}:/odm/${LIB}:/data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl:/data/asan/vendor/${LIB}:/vendor/${LIB}:/data/asan/system/${LIB}/vndk${VNDK_VER}:/system/${LIB}/vndk${VNDK_VER}:/data/asan/odm/${LIB}/vndk-sp${VNDK_VER}:/odm/${LIB}/vndk-sp${VNDK_VER}:/data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}:/vendor/${LIB}/vndk-sp${VNDK_VER}:/data/asan/system/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER}:/data/asan/system/${LIB}:/system/${LIB} +namespace.default.search.paths = /odm/${LIB} +namespace.default.search.paths += /odm/${LIB}/vndk${VNDK_VER} +namespace.default.search.paths += /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.default.search.paths += /vendor/${LIB} +namespace.default.search.paths += /vendor/${LIB}/vndk${VNDK_VER} +namespace.default.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} + +# Access to system libraries are allowed +namespace.default.search.paths += /system/${LIB}/vndk${VNDK_VER} +namespace.default.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} +namespace.default.search.paths += /system/${LIB} + +# TODO(b/70551668) Remove /vendor/${LIB}/hw from search paths. +# Shared libraries in the directory should be dlopened with full file paths. +# This is a workaround for some legacy prebuilt binaries. +namespace.default.search.paths += /vendor/${LIB}/hw + +namespace.default.asan.search.paths += /data/asan/odm/${LIB} +namespace.default.asan.search.paths += /odm/${LIB} +namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk${VNDK_VER} +namespace.default.asan.search.paths += /odm/${LIB}/vndk${VNDK_VER} +namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp${VNDK_VER} +namespace.default.asan.search.paths += /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.default.asan.search.paths += /data/asan/vendor/${LIB} +namespace.default.asan.search.paths += /vendor/${LIB} +namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk${VNDK_VER} +namespace.default.asan.search.paths += /vendor/${LIB}/vndk${VNDK_VER} +namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.default.asan.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.default.asan.search.paths += /data/asan/system/${LIB}/vndk${VNDK_VER} +namespace.default.asan.search.paths += /system/${LIB}/vndk${VNDK_VER} +namespace.default.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER} +namespace.default.asan.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} +namespace.default.asan.search.paths += /data/asan/system/${LIB} +namespace.default.asan.search.paths += /system/${LIB} + +# TODO(b/70551668) Remove /vendor/${LIB}/hw from search paths. +# Shared libraries in the directory should be dlopened with full file paths. +# This is a workaround for some legacy prebuilt binaries. +namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/hw +namespace.default.asan.search.paths += /vendor/${LIB}/hw diff --git a/rootdir/etc/ld.config.txt.in b/rootdir/etc/ld.config.txt.in index 70553934d..0e43de7de 100644 --- a/rootdir/etc/ld.config.txt.in +++ b/rootdir/etc/ld.config.txt.in @@ -7,11 +7,18 @@ # absolute path of an executable is selected. dir.system = /system/bin/ dir.system = /system/xbin/ + +dir.vendor = /odm/bin/ dir.vendor = /vendor/bin/ +dir.vendor = /data/nativetest/odm +dir.vendor = /data/nativetest64/odm +dir.vendor = /data/benchmarktest/odm +dir.vendor = /data/benchmarktest64/odm dir.vendor = /data/nativetest/vendor dir.vendor = /data/nativetest64/vendor dir.vendor = /data/benchmarktest/vendor dir.vendor = /data/benchmarktest64/vendor + dir.system = /data/nativetest dir.system = /data/nativetest64 dir.system = /data/benchmarktest @@ -27,13 +34,45 @@ additional.namespaces = sphal,vndk,rs # can't be loaded in this namespace. ############################################################################### namespace.default.isolated = true + namespace.default.search.paths = /system/${LIB} -# /vendor/app, /vendor/framework were added since libart should be able to dlopen -# the odex files from the directory. -namespace.default.permitted.paths = /system/${LIB}/drm:/system/${LIB}/extractors:/system/${LIB}/hw:/system/framework:/system/app:/system/priv-app:/vendor/app:/vendor/priv-app:/vendor/framework:/oem/app:/data:/mnt/expand -namespace.default.asan.search.paths = /data/asan/system/${LIB}:/system/${LIB} -namespace.default.asan.permitted.paths = /data:/system/${LIB}/drm:/system/${LIB}/extractors:/system/${LIB}/hw:/system/framework:/system/app:/system/priv-app:/vendor/app:/vendor/priv-app:/vendor/framework:/oem/app:/mnt/expand +# We can't have entire /system/${LIB} as permitted paths because doing so +# makes it possible to load libs in /system/${LIB}/vndk* directories by +# their absolute paths (e.g. dlopen("/system/lib/vndk/libbase.so");). +# VNDK libs are built with previous versions of Android and thus must not be +# loaded into this namespace where libs built with the current version of +# Android are loaded. Mixing the two types of libs in the same namespace can +# cause unexpected problem. +namespace.default.permitted.paths = /system/${LIB}/drm +namespace.default.permitted.paths += /system/${LIB}/extractors +namespace.default.permitted.paths += /system/${LIB}/hw +# These are where odex files are located. libart has to be able to dlopen the files +namespace.default.permitted.paths += /system/framework +namespace.default.permitted.paths += /system/app +namespace.default.permitted.paths += /system/priv-app +namespace.default.permitted.paths += /vendor/framework +namespace.default.permitted.paths += /vendor/app +namespace.default.permitted.paths += /vendor/priv-app +namespace.default.permitted.paths += /oem/app +namespace.default.permitted.paths += /data +namespace.default.permitted.paths += /mnt/expand + +namespace.default.asan.search.paths = /data/asan/system/${LIB} +namespace.default.asan.search.paths += /system/${LIB} + +namespace.default.asan.permitted.paths = /data +namespace.default.asan.permitted.paths += /system/${LIB}/drm +namespace.default.asan.permitted.paths += /system/${LIB}/extractors +namespace.default.asan.permitted.paths += /system/${LIB}/hw +namespace.default.asan.permitted.paths += /system/framework +namespace.default.asan.permitted.paths += /system/app +namespace.default.asan.permitted.paths += /system/priv-app +namespace.default.asan.permitted.paths += /vendor/framework +namespace.default.asan.permitted.paths += /vendor/app +namespace.default.asan.permitted.paths += /vendor/priv-app +namespace.default.asan.permitted.paths += /oem/app +namespace.default.asan.permitted.paths += /mnt/expand ############################################################################### # "sphal" namespace @@ -50,20 +89,30 @@ namespace.default.asan.permitted.paths = /data:/system/${LIB}/drm:/system/${LIB} ############################################################################### namespace.sphal.isolated = true namespace.sphal.visible = true -namespace.sphal.search.paths = /vendor/${LIB}/egl:/vendor/${LIB}/hw:/vendor/${LIB} -namespace.sphal.permitted.paths = /vendor/${LIB}:/system/${LIB}/vndk-sp${VNDK_VER}/hw -namespace.sphal.asan.search.paths = /data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl:/data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}:/vendor/${LIB} -namespace.sphal.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB} +namespace.sphal.search.paths = /odm/${LIB} +namespace.sphal.search.paths += /vendor/${LIB} + +namespace.sphal.permitted.paths = /odm/${LIB} +namespace.sphal.permitted.paths += /vendor/${LIB} + +namespace.sphal.asan.search.paths = /data/asan/odm/${LIB} +namespace.sphal.asan.search.paths += /odm/${LIB} +namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB} +namespace.sphal.asan.search.paths += /vendor/${LIB} + +namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB} +namespace.sphal.asan.permitted.paths += /odm/${LIB} +namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} +namespace.sphal.asan.permitted.paths += /vendor/${LIB} # Once in this namespace, access to libraries in /system/lib is restricted. Only # libs listed here can be used. namespace.sphal.links = default,vndk,rs -# WARNING: only NDK libs can be listed here. -namespace.sphal.link.default.shared_libs = %LLNDK_LIBRARIES%:%SANITIZER_RUNTIME_LIBRARIES% +namespace.sphal.link.default.shared_libs = %LLNDK_LIBRARIES% +namespace.sphal.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% -# WARNING: only VNDK-SP libs can be listed here. DO NOT EDIT this line. namespace.sphal.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES% # Renderscript gets separate namespace @@ -79,17 +128,42 @@ namespace.sphal.link.rs.shared_libs = libRS_internal.so ############################################################################### namespace.rs.isolated = true namespace.rs.visible = true -namespace.rs.search.paths = /vendor/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER}:/vendor/${LIB} -namespace.rs.permitted.paths = /vendor/${LIB}:/data -namespace.rs.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}:/vendor/${LIB}/vndk-sp${VNDK_VER}:/data/asan/system/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER}:/data/asan/vendor/${LIB}:/vendor/${LIB} -namespace.rs.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB}:/data +namespace.rs.search.paths = /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.search.paths += /odm/${LIB} +namespace.rs.search.paths += /vendor/${LIB} + +namespace.rs.permitted.paths = /odm/${LIB} +namespace.rs.permitted.paths += /vendor/${LIB} +namespace.rs.permitted.paths += /data + +namespace.rs.asan.search.paths = /data/asan/odm/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} +namespace.rs.asan.search.paths += /data/asan/odm/${LIB} +namespace.rs.asan.search.paths += /odm/${LIB} +namespace.rs.asan.search.paths += /data/asan/vendor/${LIB} +namespace.rs.asan.search.paths += /vendor/${LIB} + +namespace.rs.asan.permitted.paths = /data/asan/odm/${LIB} +namespace.rs.asan.permitted.paths += /odm/${LIB} +namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} +namespace.rs.asan.permitted.paths += /vendor/${LIB} +namespace.rs.asan.permitted.paths += /data namespace.rs.links = default,vndk -namespace.rs.link.default.shared_libs = %LLNDK_LIBRARIES%:%SANITIZER_RUNTIME_LIBRARIES% + +namespace.rs.link.default.shared_libs = %LLNDK_LIBRARIES% +namespace.rs.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% # Private LLNDK libs (e.g. libft2.so) are exceptionally allowed to this # namespace because RS framework libs are using them. namespace.rs.link.default.shared_libs += %PRIVATE_LLNDK_LIBRARIES% + namespace.rs.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES% ############################################################################### @@ -99,17 +173,43 @@ namespace.rs.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES% ############################################################################### namespace.vndk.isolated = true namespace.vndk.visible = true -namespace.vndk.search.paths = /vendor/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER} -namespace.vndk.permitted.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl -namespace.vndk.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}:/vendor/${LIB}/vndk-sp${VNDK_VER}:/data/asan/system/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER} -namespace.vndk.asan.permitted.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl +namespace.vndk.search.paths = /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} + +namespace.vndk.permitted.paths = /odm/${LIB}/hw +namespace.vndk.permitted.paths += /odm/${LIB}/egl +namespace.vndk.permitted.paths += /vendor/${LIB}/hw +namespace.vndk.permitted.paths += /vendor/${LIB}/egl +# This is exceptionally required since android.hidl.memory@1.0-impl.so is here +namespace.vndk.permitted.paths += /system/${LIB}/vndk-sp${VNDK_VER}/hw + +namespace.vndk.asan.search.paths = /data/asan/odm/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.asan.search.paths += /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER} +namespace.vndk.asan.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} + +namespace.vndk.asan.permitted.paths = /data/asan/odm/${LIB}/hw +namespace.vndk.asan.permitted.paths += /odm/${LIB}/hw +namespace.vndk.asan.permitted.paths += /data/asan/odm/${LIB}/egl +namespace.vndk.asan.permitted.paths += /odm/${LIB}/egl +namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/hw +namespace.vndk.asan.permitted.paths += /vendor/${LIB}/hw +namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl +namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl + +namespace.vndk.asan.permitted.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER}/hw +namespace.vndk.asan.permitted.paths += /system/${LIB}/vndk-sp${VNDK_VER}/hw # When these NDK libs are required inside this namespace, then it is redirected # to the default namespace. This is possible since their ABI is stable across # Android releases. namespace.vndk.links = default -namespace.vndk.link.default.shared_libs = %LLNDK_LIBRARIES%:%SANITIZER_RUNTIME_LIBRARIES% +namespace.vndk.link.default.shared_libs = %LLNDK_LIBRARIES% +namespace.vndk.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% ############################################################################### # Namespace config for vendor processes. In O, no restriction is enforced for @@ -133,14 +233,45 @@ additional.namespaces = system namespace.default.isolated = true namespace.default.visible = true -namespace.default.search.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl:/vendor/${LIB}:/vendor/${LIB}/vndk${VNDK_VER}:/vendor/${LIB}/vndk-sp${VNDK_VER} -namespace.default.permitted.paths = /vendor +namespace.default.search.paths = /odm/${LIB} +namespace.default.search.paths += /odm/${LIB}/vndk${VNDK_VER} +namespace.default.search.paths += /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.default.search.paths += /vendor/${LIB} +namespace.default.search.paths += /vendor/${LIB}/vndk${VNDK_VER} +namespace.default.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} -namespace.default.asan.search.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl:/data/asan/vendor/${LIB}:/vendor/${LIB}:/data/asan/vendor/${LIB}/vndk${VNDK_VER}:/vendor/${LIB}/vndk${VNDK_VER}:/data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}:/vendor/${LIB}/vndk-sp${VNDK_VER} -namespace.default.asan.permitted.paths = /data/asan/vendor:/vendor +# TODO(b/70551668) remove this +namespace.default.search.paths += /vendor/${LIB}/hw + +namespace.default.permitted.paths = /odm +namespace.default.permitted.paths += /vendor + +namespace.default.asan.search.paths = /data/asan/odm/${LIB} +namespace.default.asan.search.paths += /odm/${LIB} +namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk${VNDK_VER} +namespace.default.asan.search.paths += /odm/${LIB}/vndk${VNDK_VER} +namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp${VNDK_VER} +namespace.default.asan.search.paths += /odm/${LIB}/vndk-sp${VNDK_VER} +namespace.default.asan.search.paths += /data/asan/vendor/${LIB} +namespace.default.asan.search.paths += /vendor/${LIB} +namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk${VNDK_VER} +namespace.default.asan.search.paths += /vendor/${LIB}/vndk${VNDK_VER} +namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER} +namespace.default.asan.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER} + +# TODO(b/70551668) remove this +namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/hw +namespace.default.asan.search.paths += /vendor/${LIB}/hw + +namespace.default.asan.permitted.paths = /data/asan/odm +namespace.default.asan.permitted.paths += /odm +namespace.default.asan.permitted.paths += /data/asan/vendor +namespace.default.asan.permitted.paths += /vendor namespace.default.links = system -namespace.default.link.system.shared_libs = %LLNDK_LIBRARIES%:%VNDK_SAMEPROCESS_LIBRARIES%:%VNDK_CORE_LIBRARIES% +namespace.default.link.system.shared_libs = %LLNDK_LIBRARIES% +namespace.default.link.system.shared_libs += %VNDK_SAMEPROCESS_LIBRARIES% +namespace.default.link.system.shared_libs += %VNDK_CORE_LIBRARIES% ############################################################################### # "system" namespace @@ -149,6 +280,14 @@ namespace.default.link.system.shared_libs = %LLNDK_LIBRARIES%:%VNDK_SAMEPROCESS_ # a vendor process. ############################################################################### namespace.system.isolated = false -namespace.system.search.paths = /system/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk${VNDK_VER}:/system/${LIB} -namespace.system.asan.search.paths = /data/asan/system/${LIB}/vndk-sp${VNDK_VER}:/system/${LIB}/vndk-sp${VNDK_VER}:/data/asan/system/${LIB}/vndk${VNDK_VER}:/system/${LIB}/vndk${VNDK_VER}:/data/asan/system/${LIB}:/system/${LIB} +namespace.system.search.paths = /system/${LIB}/vndk-sp${VNDK_VER} +namespace.system.search.paths += /system/${LIB}/vndk${VNDK_VER} +namespace.system.search.paths += /system/${LIB} + +namespace.system.asan.search.paths = /data/asan/system/${LIB}/vndk-sp${VNDK_VER} +namespace.system.asan.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} +namespace.system.asan.search.paths += /data/asan/system/${LIB}/vndk${VNDK_VER} +namespace.system.asan.search.paths += /system/${LIB}/vndk${VNDK_VER} +namespace.system.asan.search.paths += /data/asan/system/${LIB} +namespace.system.asan.search.paths += /system/${LIB} |