commit fdd46848364b5fdb7360cb3256bd9482d7ca3c28
author Vladimir Marko <vmarko@google.com> Wed Mar 25 14:57:17 2020 +0000
committer Vladimir Marko <vmarko@google.com> Tue Mar 31 13:16:12 2020 +0000
tree d3e47c9723155f6376e3782cc47658a295c1da1c
parent 4ac8d96c332b014b72c2480aa1c83762e818daef

Deduplicate interned image strings.

Also fix a bug in relocation; even for -Xnorelocate we need
to relocate second and later extension if it's not compiled
against all previous boot image components.

Also clean up InternTable includes.

Test: New tests in image_space_test.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: aosp_taimen-userdebug boots.
Bug: 152037801
Change-Id: Ie6ae70721f4ffb48950bd248ffa123dee460bcd7

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index 024e55e..db21339 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -950,6 +950,8 @@
         ":art-gtest-jars-ErroneousA",
         ":art-gtest-jars-ErroneousB",
         ":art-gtest-jars-ErroneousInit",
+        ":art-gtest-jars-Extension1",
+        ":art-gtest-jars-Extension2",
         ":art-gtest-jars-ForClassLoaderA",
         ":art-gtest-jars-ForClassLoaderB",
         ":art-gtest-jars-ForClassLoaderC",
@@ -1050,6 +1052,18 @@
 }
 
 java_library {
+    name: "art-gtest-jars-Extension1",
+    srcs: ["Extension1/**/*.java"],
+    defaults: ["art-gtest-jars-defaults"],
+}
+
+java_library {
+    name: "art-gtest-jars-Extension2",
+    srcs: ["Extension2/**/*.java"],
+    defaults: ["art-gtest-jars-defaults"],
+}
+
+java_library {
     name: "art-gtest-jars-ForClassLoaderA",
     srcs: ["ForClassLoaderA/**/*.java"],
     defaults: ["art-gtest-jars-defaults"],