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
xamarin · May 26, 2020 · d5434cc · d5434cc
2 parents 30aef88 + c787f2b
commit d5434cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/METADATA b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
diff --git a/dist/Android.bp b/dist/Android.bp
@@ -40,10 +40,6 @@ cc_defaults {
         "-DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD",
         "-Wno-unused-parameter",
         "-Werror",
-
-        // Turn off the new pass manager due to miscompile.
-        // http://b/131854833
-        "-fno-experimental-new-pass-manager",
     ],
 
     target: {