diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2017-11-17 00:33:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-17 00:33:58 +0000 |
| commit | d1071f601f4a2caebb26ef35015dfc46adb1a360 (patch) | |
| tree | 688626215747406062fd2b32c08e69138006e51a | |
| parent | 3e573c6688f0a7d0baae2079517a48946c66ecfb (diff) | |
| parent | bf1428355df319376ea6abcf78c6b3fbec2a0986 (diff) | |
| download | extras-android-vts-8.0_r7.tar.gz | |
Merge "Snap for 4455664 from 02ca18a389e74c379dbc3925984a74f074a3efe1 to oreo-vts-release" into oreo-vts-releaseandroid-vts-8.0_r7android-vts-8.0_r6
| -rw-r--r-- | simpleperf/cmd_report_sample.cpp | 2 | ||||
| -rw-r--r-- | tests/kernel.config/Android.mk | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/simpleperf/cmd_report_sample.cpp b/simpleperf/cmd_report_sample.cpp index 886d1b4c..83dc90bf 100644 --- a/simpleperf/cmd_report_sample.cpp +++ b/simpleperf/cmd_report_sample.cpp @@ -186,7 +186,6 @@ bool ReportSampleCommand::Run(const std::vector<std::string>& args) { return false; } protobuf_coded_os.reset(nullptr); - google::protobuf::ShutdownProtobufLibrary(); } else { PrintLostSituation(); fflush(report_fp_); @@ -332,7 +331,6 @@ bool ReportSampleCommand::DumpProtobufReport(const std::string& filename) { return false; } } - google::protobuf::ShutdownProtobufLibrary(); return true; } diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk index 9be5d9d0..2678f274 100644 --- a/tests/kernel.config/Android.mk +++ b/tests/kernel.config/Android.mk @@ -16,7 +16,6 @@ test_c_flags := \ # Required Tests cts_src_files := \ multicast_test.cpp \ - pstore_test.cpp \ sysvipc_test.cpp \ logger_test.cpp @@ -27,6 +26,7 @@ test_src_files := \ aslr_test.cpp \ aslr_rec_test.cpp \ mmc_max_speed_test.cpp \ + pstore_test.cpp \ include $(CLEAR_VARS) LOCAL_MODULE := kernel-config-unit-tests |