diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-11-05 08:04:24 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-05 08:04:23 -0800 |
| commit | 078396ec4c69a680d32480766bb94bc8e93f99fd (patch) | |
| tree | ed5b7a040b67275dd123b8ba46d4793d4e9b6746 /tools | |
| parent | c4920ff327662e44bfa5a861bf4df980662fc51f (diff) | |
| parent | bc046dc1ddf4c3d8cb9687cdd4b769e26d4fb0c9 (diff) | |
Merge "Merge android-4.4-p.196 (736005d) into msm-4.4"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lib/traceevent/Makefile | 6 | ||||
| -rw-r--r-- | tools/lib/traceevent/event-plugin.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index 7851df1490e0..cc3315da6dc3 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile @@ -54,15 +54,15 @@ set_plugin_dir := 1 # Set plugin_dir to preffered global plugin location # If we install under $HOME directory we go under -# $(HOME)/.traceevent/plugins +# $(HOME)/.local/lib/traceevent/plugins # # We dont set PLUGIN_DIR in case we install under $HOME # directory, because by default the code looks under: -# $(HOME)/.traceevent/plugins by default. +# $(HOME)/.local/lib/traceevent/plugins by default. # ifeq ($(plugin_dir),) ifeq ($(prefix),$(HOME)) -override plugin_dir = $(HOME)/.traceevent/plugins +override plugin_dir = $(HOME)/.local/lib/traceevent/plugins set_plugin_dir := 0 else override plugin_dir = $(libdir)/traceevent/plugins diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c index a16756ae3526..5fe7889606a2 100644 --- a/tools/lib/traceevent/event-plugin.c +++ b/tools/lib/traceevent/event-plugin.c @@ -30,7 +30,7 @@ #include "event-parse.h" #include "event-utils.h" -#define LOCAL_PLUGIN_DIR ".traceevent/plugins" +#define LOCAL_PLUGIN_DIR ".local/lib/traceevent/plugins/" static struct registered_plugin_options { struct registered_plugin_options *next; |