diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-26 02:27:06 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-26 02:27:06 +0000 |
commit | f507a330404c4cb07b2c91635014c0fc9c04ce44 (patch) | |
tree | 526f4e2b352e5eede4fd47b6c428295276e27598 | |
parent | 752cfadb9af82157fdda6504f07d5760e5a7f59f (diff) | |
parent | dc0b5de26265c76d50c575e574eda1385925eadb (diff) | |
download | extras-f507a330404c4cb07b2c91635014c0fc9c04ce44.tar.gz |
Snap for 9104469 from dc0b5de26265c76d50c575e574eda1385925eadb to gki13-boot-release
Change-Id: I7e46abff55ea8b63cd97c36a8d0ee4568931da9b
-rw-r--r-- | simpleperf/environment.cpp | 11 | ||||
-rw-r--r-- | simpleperf/scripts/Android.bp | 9 |
2 files changed, 15 insertions, 5 deletions
diff --git a/simpleperf/environment.cpp b/simpleperf/environment.cpp index 8e95d449..253a4b6e 100644 --- a/simpleperf/environment.cpp +++ b/simpleperf/environment.cpp @@ -299,15 +299,16 @@ bool CheckPerfEventLimit() { } } if (can_read_allow_file) { - LOG(WARNING) << perf_event_allow_path << " is " << limit_level << ", " - << GetLimitLevelDescription(limit_level) << "."; + LOG(ERROR) << perf_event_allow_path << " is " << limit_level << ", " + << GetLimitLevelDescription(limit_level) << "."; } - LOG(WARNING) << "Try using `adb shell setprop security.perf_harden 0` to allow profiling."; + LOG(ERROR) << "Try using `adb shell setprop security.perf_harden 0` to allow profiling."; return false; #else if (can_read_allow_file) { - LOG(WARNING) << perf_event_allow_path << " is " << limit_level << ", " - << GetLimitLevelDescription(limit_level) << "."; + LOG(ERROR) << perf_event_allow_path << " is " << limit_level << ", " + << GetLimitLevelDescription(limit_level) << ". Try using `echo -1 >" + << perf_event_allow_path << "` to enable profiling."; return false; } #endif diff --git a/simpleperf/scripts/Android.bp b/simpleperf/scripts/Android.bp index 8beeb8c1..abbbe249 100644 --- a/simpleperf/scripts/Android.bp +++ b/simpleperf/scripts/Android.bp @@ -14,6 +14,15 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_extras_simpleperf_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_extras_simpleperf_license"], +} + python_library_host { name: "simpleperf_report_lib", srcs: [ |