Remove the dexlayout library from the APEX.

Also remove the dexlayout(d) and dexdiag binaries from the debug APEX
and the art-tools mk module.

Also remove references to the dexlayout-related gtests.

Test: art/tools/buildbot-build.sh
Test: art/build/apex/runtests.sh
Bug: 325430813
Change-Id: I6a6cbc0eecfedf3e020eb1c9e4d4f1479cf4a6dc

5 files changed, 2 insertions, 27 deletions

diff --git a/Android.mk b/Android.mk
index ecd36fafa9..95d7efbd77 100644
--- a/Android.mk
+++ b/Android.mk
@@ -62,7 +62,6 @@ LOCAL_REQUIRED_MODULES := \
 # APEX builds when HOST_PREFER_32_BIT is set (b/120617876).
 ifneq ($(HOST_PREFER_32_BIT),true)
 LOCAL_REQUIRED_MODULES += \
-    dexdiag \
     dexlist \
     oatdump \
 
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 32edf16a36..3257942c6b 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -106,9 +106,7 @@ ART_TEST_MODULES_COMMON := \
     art_compiler_host_tests \
     art_compiler_tests \
     art_dexanalyze_tests \
-    art_dexdiag_tests \
     art_dexdump_tests \
-    art_dexlayout_tests \
     art_dexlist_tests \
     art_dexoptanalyzer_tests \
     art_disassembler_tests \
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 7c2721f44b..e882513801 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -93,9 +93,6 @@ art_debug_binaries_both = [
 // Debug binaries for which the "first" version is preferred.
 art_debug_binaries_first = [
     "dexanalyze",
-    "dexdiag",
-    "dexlayout",
-    "dexlayoutd",
     "dexoptanalyzerd",
     "oatdumpd",
     "profmand",
@@ -331,9 +328,7 @@ art_gtests = [
     "art_compiler_tests",
     "art_dex2oat_tests",
     "art_dexanalyze_tests",
-    "art_dexdiag_tests",
     "art_dexdump_tests",
-    "art_dexlayout_tests",
     "art_dexlist_tests",
     "art_disassembler_tests",
     "art_dexoptanalyzer_tests",
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 05cc1a6314..ff98d961fa 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -475,7 +475,6 @@ class ReleaseChecker:
     # Check internal libraries for ART.
     self._checker.check_native_library('libadbconnection')
     self._checker.check_native_library('libart')
-    self._checker.check_native_library('libart-dexlayout')
     self._checker.check_native_library('libart-disassembler')
     self._checker.check_native_library('libartbase')
     self._checker.check_native_library('libartpalette')
@@ -603,13 +602,10 @@ class DebugChecker:
 
   def run(self):
     # Check binaries for ART.
-    self._checker.check_executable('dexdiag')
     self._checker.check_executable('dexanalyze')
-    self._checker.check_executable('dexlayout')
     self._checker.check_symlinked_multilib_executable('imgdiag')
 
     # Check debug binaries for ART.
-    self._checker.check_executable('dexlayoutd')
     self._checker.check_executable('dexoptanalyzerd')
     self._checker.check_symlinked_multilib_executable('imgdiagd')
     self._checker.check_executable('profmand')
@@ -621,7 +617,6 @@ class DebugChecker:
     self._checker.check_native_library('libadbconnectiond')
     self._checker.check_native_library('libartbased')
     self._checker.check_native_library('libartd')
-    self._checker.check_native_library('libartd-dexlayout')
     self._checker.check_native_library('libartd-disassembler')
     self._checker.check_native_library('libopenjdkjvmd')
     self._checker.check_native_library('libopenjdkjvmtid')
@@ -659,8 +654,8 @@ class DebugTargetChecker:
     # double_loadable:true, cf. go/double_loadable). Also, like in the release
     # package we need to look out for dependencies that should go through
     # exported library stubs (until b/128708192 is fixed).
-    self._checker.check_prefer64_library('libmeminfo')
-    self._checker.check_prefer64_library('libprocinfo')
+    #
+    # (There are currently no debug-only native libraries.)
 
 
 class TestingTargetChecker:
@@ -677,9 +672,7 @@ class TestingTargetChecker:
     self._checker.check_art_test_executable('art_compiler_tests')
     self._checker.check_art_test_executable('art_dex2oat_tests')
     self._checker.check_art_test_executable('art_dexanalyze_tests')
-    self._checker.check_art_test_executable('art_dexdiag_tests')
     self._checker.check_art_test_executable('art_dexdump_tests')
-    self._checker.check_art_test_executable('art_dexlayout_tests')
     self._checker.check_art_test_executable('art_dexlist_tests')
     self._checker.check_art_test_executable('art_dexoptanalyzer_tests')
     self._checker.check_art_test_executable('art_disassembler_tests')
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 1bec1cf889..9e1f21c930 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -112,7 +112,6 @@ art_cc_library_static {
     name: "libart-dex2oat",
     defaults: ["libart-dex2oat-defaults"],
     shared_libs: [
-        "libart-dexlayout",
         "libart",
         "libartpalette",
         "libprofile",
@@ -134,7 +133,6 @@ cc_defaults {
         "libprofile_static_defaults",
     ],
     whole_static_libs: [
-        "libart-dexlayout",
         "libart-dex2oat",
     ],
 }
@@ -148,7 +146,6 @@ art_cc_library_static {
     defaults: [
         "art_defaults",
         "libart-dex2oat_static_defaults",
-        "libart-dexlayout_static_defaults",
         "libart_static_defaults",
         "libartbase_static_defaults",
         "libdexfile_static_defaults",
@@ -163,7 +160,6 @@ art_cc_library_static {
         "libart-dex2oat-defaults",
     ],
     shared_libs: [
-        "libartd-dexlayout",
         "libartd",
         "libartpalette",
         "libprofiled",
@@ -184,7 +180,6 @@ cc_defaults {
         "libprofiled_static_defaults",
     ],
     whole_static_libs: [
-        "libartd-dexlayout",
         "libartd-dex2oat",
     ],
 }
@@ -197,7 +192,6 @@ art_cc_library_static {
         "art_debug_defaults",
         "libartbased_static_defaults",
         "libartd-dex2oat_static_defaults",
-        "libartd-dexlayout_static_defaults",
         "libartd_static_defaults",
         "libdexfiled_static_defaults",
         "libprofiled_static_defaults",
@@ -258,7 +252,6 @@ art_cc_binary {
         android: {
             shared_libs: [
                 "libart",
-                "libart-dexlayout",
                 "libartbase",
                 "libdexfile",
                 "libprofile",
@@ -319,7 +312,6 @@ art_cc_binary {
             shared_libs: [
                 "libartbased",
                 "libartd",
-                "libartd-dexlayout",
                 "libdexfiled",
                 "libprofiled",
             ],
@@ -521,7 +513,6 @@ art_cc_test {
         "libartd-dex2oat",
         "libartd-dex2oat-gtest",
         "libvixld",
-        "libartd-dexlayout",
     ],
 }
 
@@ -537,7 +528,6 @@ art_cc_test {
         "libart-dex2oat",
         "libart-dex2oat-gtest",
         "libvixl",
-        "libart-dexlayout",
     ],
     test_config: "art_standalone_dex2oat_tests.xml",
 }