diff options
author | Pirama Arumuga Nainar <pirama@google.com> | 2019-07-09 15:32:48 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-09 15:32:48 +0000 |
commit | 52aa89d133ac62468fe96bcaa242210510cddc05 (patch) | |
tree | 15b822cfb708547b5a2ddfd7631e74bef3d07d78 | |
parent | 1c41026536f15b34b75388f4adb83323a343532b (diff) | |
parent | a277ce976288ac0a35a9016970f6e49037eaeadb (diff) | |
download | extras-52aa89d133ac62468fe96bcaa242210510cddc05.tar.gz |
Merge "Wrap getenv and append euid to GCOV_PREFIX"android-o-mr1-iot-release-1.0.14
-rw-r--r-- | toolchain-extras/Android.bp | 5 | ||||
-rw-r--r-- | toolchain-extras/profile-globals.c | 42 |
2 files changed, 47 insertions, 0 deletions
diff --git a/toolchain-extras/Android.bp b/toolchain-extras/Android.bp index ea0c130a..7cc97344 100644 --- a/toolchain-extras/Android.bp +++ b/toolchain-extras/Android.bp @@ -2,6 +2,7 @@ cc_defaults { name: "libprofile-defaults", srcs: [ "profile-extras.cpp", + "profile-globals.c", ], native_coverage: false, } @@ -26,6 +27,10 @@ cc_library_static { name: "libprofile-extras_ndk", defaults: ["libprofile-defaults",], native_bridge_supported: true, + vendor_available: true, + vndk: { + enabled: true, + }, sdk_version: "minimum", } diff --git a/toolchain-extras/profile-globals.c b/toolchain-extras/profile-globals.c new file mode 100644 index 00000000..95bd46dd --- /dev/null +++ b/toolchain-extras/profile-globals.c @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/types.h> + +// This file provides a wrapper for getenv that appends the userid (geteuid()) +// of the current process to GCOV_PREFIX. This avoids conflicts and permissions +// issues when different processes try to create/access the same directories and +// files under $GCOV_PREFIX. +// +// When this file is linked to a binary, the -Wl,--wrap,getenv flag must be +// used. The linker redirects calls to getenv to __wrap_getenv and sets +// __real_getenv to point to libc's getenv. + +char *__real_getenv(const char *name); + +static char modified_gcov_prefix[128]; + +__attribute__((weak)) char *__wrap_getenv(const char *name) { + if (strcmp(name, "GCOV_PREFIX") != 0) { + return __real_getenv(name); + } + + sprintf(modified_gcov_prefix, "%s/%u", __real_getenv(name), geteuid()); + return modified_gcov_prefix; +} |