Skip to content
This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Commit d5434cc

Browse files
committed
Merge remote-tracking branch 'upstream/master'
* upstream/master: Revert^3 "Turn off the new pass manager due to miscompile" Add METADATA to sqlite: Apache2=NOTICE resolve merge conflicts of 9c46de6 to oc-dr1-dev [RESTRICT AUTOMERGE] Apply security patch to sqlite 3.22 [RESTRICT AUTOMERGE] Apply security patch to sqlite 3.18 Apply security patch to sqlite 3.22
2 parents 30aef88 + c787f2b commit d5434cc

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

METADATA

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
third_party {
2+
license_type: NOTICE
3+
}

dist/Android.bp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ cc_defaults {
4040
"-DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD",
4141
"-Wno-unused-parameter",
4242
"-Werror",
43-
44-
// Turn off the new pass manager due to miscompile.
45-
// http://b/131854833
46-
"-fno-experimental-new-pass-manager",
4743
],
4844

4945
target: {

0 commit comments

Comments
 (0)