Merge remote-tracking branch 'aosp/upstream' into update_kati
* aosp/upstream:
Replace StringPiece with std::string_view
Remove usages of using namespace std;
Add ninja version of $? test case
Run clang-format
Update AUTHORS
Simplify implementation of $? for ninja
Implement $? for ninja
Add test case for $?
Disable $? in ninja mode
Update AUTHORS and CONTRIBUTORS
Implement $?
Fix tests for ubuntu 22.04
Add workflow_dispatch trigger to github action
Fix CI
Add --variable_assignment_trace_filter option
Fix unqualified-std-cast-call compiler warning
Correct result of Stem()
Change-Id: I056bfb6fc0193aa51728d52c4d06974a462b1a2d
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..1ee860c
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+include platform/build/soong:/OWNERS
+
diff --git a/src/Android.bp b/src/Android.bp
index 99c3c69..c56ab34 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -68,7 +68,7 @@
whole_static_libs: ["libckati"],
target: {
linux_glibc: {
- shared_libs: ["libjemalloc"],
+ shared_libs: ["libjemalloc5"],
},
},
}
@@ -87,7 +87,6 @@
srcs: [
"find_test.cc",
"ninja_test.cc",
- "strutil_bench.cc",
"strutil_test.cc",
],
gtest: false,
@@ -102,3 +101,12 @@
],
static_libs: ["libckati"],
}
+
+cc_test_host {
+ name: "ckati_strutil_bench",
+ defaults: ["ckati_defaults"],
+ srcs: [
+ "strutil_bench.cc",
+ ],
+ static_libs: ["libckati"],
+}
diff --git a/src/eval.cc b/src/eval.cc
index 84de857..aacb871 100644
--- a/src/eval.cc
+++ b/src/eval.cc
@@ -182,7 +182,7 @@
Evaluator::~Evaluator() {
if (assignment_tracefile_ != nullptr && assignment_tracefile_ != stderr) {
- fclose(assignment_tracefile_);
+ fclose(assignment_tracefile_);
}
// delete vars_;
