summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-06-14 10:45:53 -0700
committer Xin Li <delphij@google.com> 2024-06-17 18:48:51 +0000
commit99f7cae71cea35238176d8cb28d940abdfa824e6 (patch)
tree278bf7dd9055dbe18d93e6b2fba8f1e53d87b205
parentc105cd8f7b1a1489a918e5449752dfa2fbe824b0 (diff)
parentb9cf699ee3de7d24ca7623860ee813afd696c666 (diff)
Merge Android 14 QPR3 to AOSP main
Bug: 346855327 Merged-In: Id1ac56c628cc8127c68e6ea333f60987df7a19d7 Change-Id: I39ff3c2531a71520d4d112b6de1f4edfbb1ac333
-rw-r--r--test/845-data-image/Android.bp3
-rw-r--r--test/845-data-image/lint-baseline.xml15
2 files changed, 18 insertions, 0 deletions
diff --git a/test/845-data-image/Android.bp b/test/845-data-image/Android.bp
index 13eaaaa575..f2556e1942 100644
--- a/test/845-data-image/Android.bp
+++ b/test/845-data-image/Android.bp
@@ -16,6 +16,9 @@ java_library {
name: "art-run-test-845-data-image-src-art",
defaults: ["art-run-test-defaults"],
srcs: ["src-art/**/*.java"],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
// Test's Dex code.
diff --git a/test/845-data-image/lint-baseline.xml b/test/845-data-image/lint-baseline.xml
new file mode 100644
index 0000000000..05a7614258
--- /dev/null
+++ b/test/845-data-image/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
+
+ <issue
+ id="NewApi"
+ message="Call requires API level 34 (current min is 31): `dalvik.system.DexFile.OptimizationInfo#isOptimized`"
+ errorLine1=" if (!info.isOptimized() &amp;&amp; !isInImageSpace(Main.class)) {"
+ errorLine2=" ~~~~~~~~~~~">
+ <location
+ file="art/test/845-data-image/src-art/Main.java"
+ line="165"
+ column="17"/>
+ </issue>
+
+</issues> \ No newline at end of file