From 066dd902930582873e7d9372ac0c8483ac700cb9 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Thu, 19 Dec 2019 02:11:59 +0000 Subject: [PATCH] Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR Reason for revert: relanding with fix Reverted Changes: Ic4119368c:Revert submission 1191937-art_apex_available Ia084976bb:Revert submission 1191937-art_apex_available Iada86226d:Revert submission 1191937-art_apex_available Ic76735eac:Revert submission 1191937-art_apex_available I1eb30e355:Revert submission 1191937-art_apex_available Icaf95d260:Revert submission 1191937-art_apex_available Ie8bace4be:Revert submission 1191937-art_apex_available I8961702cf:Revert submission 1191937-art_apex_available I39316f9ef:Revert submission 1191937-art_apex_available I522a7e83b:Revert submission 1191937-art_apex_available I8b9424976:Revert submission 1191937-art_apex_available I48b998629:Revert submission 1191937-art_apex_available Change-Id: I7a101d39ff63c153675e4e741f9de1a15a778d33 --- Android.mk | 42 +++++++++++++-------------- adbconnection/Android.bp | 7 +++++ build/Android.common_path.mk | 5 ++-- build/Android.gtest.mk | 8 +++-- compiler/Android.bp | 7 +++++ dalvikvm/Android.bp | 4 +++ dex2oat/Android.bp | 13 +++++++++ dexdump/Android.bp | 5 ++++ dexlayout/Android.bp | 18 ++++++++++++ dexlist/Android.bp | 4 +++ dexoptanalyzer/Android.bp | 7 +++++ disassembler/Android.bp | 4 +++ dt_fd_forward/Android.bp | 4 +++ imgdiag/Android.bp | 7 +++++ libartbase/Android.bp | 10 +++++++ libartpalette/Android.bp | 7 +++++ libdexfile/Android.bp | 20 +++++++++++++ libelffile/Android.bp | 6 ++++ libnativebridge/Android.bp | 4 +++ libnativeloader/Android.bp | 4 +++ libprofile/Android.bp | 7 +++++ oatdump/Android.bp | 7 +++++ openjdkjvm/Android.bp | 7 +++++ openjdkjvmti/Android.bp | 7 +++++ perfetto_hprof/Android.bp | 7 +++++ profman/Android.bp | 7 +++++ runtime/Android.bp | 7 +++++ sigchainlib/Android.bp | 7 +++++ simulator/Android.bp | 3 ++ test/Android.bp | 9 ++++++ tools/cpp-define-generator/Android.bp | 1 + tools/dexanalyze/Android.bp | 4 +++ 32 files changed, 233 insertions(+), 26 deletions(-) diff --git a/Android.mk b/Android.mk index 36e5b90e5c..467490f68d 100644 --- a/Android.mk +++ b/Android.mk @@ -407,16 +407,16 @@ LOCAL_MODULE := art-runtime # Base requirements. LOCAL_REQUIRED_MODULES := \ - dalvikvm \ - dex2oat \ - dexoptanalyzer \ - libart \ - libart-compiler \ - libopenjdkjvm \ - libopenjdkjvmti \ - profman \ - libadbconnection \ - libperfetto_hprof \ + dalvikvm.com.android.art.release \ + dex2oat.com.android.art.release \ + dexoptanalyzer.com.android.art.release \ + libart.com.android.art.release \ + libart-compiler.com.android.art.release \ + libopenjdkjvm.com.android.art.release \ + libopenjdkjvmti.com.android.art.release \ + profman.com.android.art.release \ + libadbconnection.com.android.art.release \ + libperfetto_hprof.com.android.art.release \ # Potentially add in debug variants: # @@ -430,16 +430,16 @@ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) endif ifeq (true,$(art_target_include_debug_build)) LOCAL_REQUIRED_MODULES += \ - dex2oatd \ - dexoptanalyzerd \ - libartd \ - libartd-compiler \ - libopenjdkd \ - libopenjdkjvmd \ - libopenjdkjvmtid \ - profmand \ - libadbconnectiond \ - libperfetto_hprofd \ + dex2oatd.com.android.art.debug \ + dexoptanalyzerd.com.android.art.debug \ + libartd.com.android.art.debug \ + libartd-compiler.com.android.art.debug \ + libopenjdkd.com.android.art.debug \ + libopenjdkjvmd.com.android.art.debug \ + libopenjdkjvmtid.com.android.art.debug \ + profmand.com.android.art.debug \ + libadbconnectiond.com.android.art.debug \ + libperfetto_hprofd.com.android.art.debug \ endif endif @@ -625,7 +625,7 @@ build-art-target-golem: dex2oat dalvikvm linker libstdc++ \ $(TARGET_OUT_EXECUTABLES)/art \ $(TARGET_OUT)/etc/public.libraries.txt \ $(ART_TARGET_DEX_DEPENDENCIES) \ - $(ART_TARGET_SHARED_LIBRARY_DEPENDENCIES) \ + $(ART_DEBUG_TARGET_SHARED_LIBRARY_DEPENDENCIES) \ $(ART_TARGET_SHARED_LIBRARY_BENCHMARK) \ $(TARGET_CORE_IMG_OUT_BASE).art \ $(TARGET_CORE_IMG_OUT_BASE)-interpreter.art \ diff --git a/adbconnection/Android.bp b/adbconnection/Android.bp index 239cecb2b9..b2503e1b49 100644 --- a/adbconnection/Android.bp +++ b/adbconnection/Android.bp @@ -53,6 +53,10 @@ art_cc_library { "libart", "libartbase", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } // We export a library to do the server-side socket handling that gets loaded @@ -91,4 +95,7 @@ art_cc_library { "libartd", "libartbased", ], + apex_available: [ + "com.android.art.debug", + ], } diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index df35bd8fb3..4cc408ed2e 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -111,10 +111,11 @@ ART_HOST_SHARED_LIBRARY_DEPENDENCIES += $(foreach lib,$(ART_CORE_SHARED_LIBRARIE ART_HOST_SHARED_LIBRARY_DEBUG_DEPENDENCIES += $(foreach lib,$(ART_CORE_SHARED_DEBUG_LIBRARIES), $(2ND_HOST_OUT_SHARED_LIBRARIES)/$(lib).so) endif -ART_TARGET_SHARED_LIBRARY_DEPENDENCIES := $(foreach lib,$(ART_CORE_SHARED_LIBRARIES), $(TARGET_OUT_SHARED_LIBRARIES)/$(lib).so) +# Both the primary and the secondary arches of the libs are built by depending +# on the module name. +ART_DEBUG_TARGET_SHARED_LIBRARY_DEPENDENCIES := $(foreach lib,$(ART_CORE_SHARED_LIBRARIES), $(lib).com.android.art.debug) ART_TARGET_SHARED_LIBRARY_DEBUG_DEPENDENCIES := $(foreach lib,$(ART_CORE_SHARED_DEBUG_LIBRARIES), $(TARGET_OUT_SHARED_LIBRARIES)/$(lib).so) ifdef TARGET_2ND_ARCH -ART_TARGET_SHARED_LIBRARY_DEPENDENCIES += $(foreach lib,$(ART_CORE_SHARED_LIBRARIES), $(2ND_TARGET_OUT_SHARED_LIBRARIES)/$(lib).so) ART_TARGET_SHARED_LIBRARY_DEBUG_DEPENDENCIES += $(foreach lib,$(ART_CORE_SHARED_DEBUG_LIBRARIES), $(2ND_TARGET_OUT_SHARED_LIBRARIES)/$(lib).so) endif diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index c9f05b533d..abc8f6f0a3 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -500,13 +500,15 @@ define define-art-gtest-rule-target # Add the test dependencies to test-art-target-sync, which will be a prerequisite for the test # to ensure files are pushed to the device. + # Note that, both the primary and the secondary arches of the libs are built by depending + # on the module name. gtest_deps := \ $$(ART_GTEST_$(1)_TARGET_DEPS) \ $(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_TARGET_GTEST_$(file)_DEX)) \ $$(gtest_exe) \ - $$($(3)TARGET_OUT_SHARED_LIBRARIES)/libicu_jni.so \ - $$($(3)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \ - $$($(3)TARGET_OUT_SHARED_LIBRARIES)/libopenjdkd.so \ + libicu_jni.com.android.art.debug \ + libjavacore.com.android.art.debug \ + libopenjdkd.com.android.art.debug \ $$(foreach jar,$$(TARGET_TEST_CORE_JARS),$$(TARGET_OUT_JAVA_LIBRARIES)/$$(jar).jar) ART_TEST_TARGET_GTEST_DEPENDENCIES += $$(gtest_deps) diff --git a/compiler/Android.bp b/compiler/Android.bp index dfd71f1bb2..532f7d6051 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -266,6 +266,10 @@ art_cc_library { }, }, }, + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } cc_defaults { @@ -330,6 +334,9 @@ art_cc_library { "libdexfiled", ], whole_static_libs: ["libelffiled"], + apex_available: [ + "com.android.art.debug", + ], } cc_defaults { diff --git a/dalvikvm/Android.bp b/dalvikvm/Android.bp index 06883186ed..8cd88199e6 100644 --- a/dalvikvm/Android.bp +++ b/dalvikvm/Android.bp @@ -54,4 +54,8 @@ art_cc_binary { // Create symlink for the primary version target. symlink_preferred_arch: true, + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp index 14bca00c9e..635a3d327f 100644 --- a/dex2oat/Android.bp +++ b/dex2oat/Android.bp @@ -118,6 +118,9 @@ art_cc_library_static { "libartpalette", "libprofile", ], + apex_available: [ + "com.android.art.release", + ], } cc_defaults { @@ -147,6 +150,9 @@ art_cc_library_static { "libartpalette", "libprofiled", ], + apex_available: [ + "com.android.art.debug", + ], } cc_defaults { @@ -283,6 +289,10 @@ art_cc_binary { ], }, }, + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_binary { @@ -330,6 +340,9 @@ art_cc_binary { suffix: "64", }, }, + apex_available: [ + "com.android.art.debug", + ], } cc_defaults { diff --git a/dexdump/Android.bp b/dexdump/Android.bp index f46b4dea3e..0bbb0012b7 100644 --- a/dexdump/Android.bp +++ b/dexdump/Android.bp @@ -52,6 +52,11 @@ art_cc_binary { enabled: true, }, }, + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + "//apex_available:platform", // for SDK + ], } art_cc_test { diff --git a/dexlayout/Android.bp b/dexlayout/Android.bp index 65bb92cdd8..cd406208f6 100644 --- a/dexlayout/Android.bp +++ b/dexlayout/Android.bp @@ -94,6 +94,10 @@ art_cc_library { ], }, }, + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } cc_defaults { @@ -136,6 +140,9 @@ art_cc_library { ], }, }, + apex_available: [ + "com.android.art.debug", + ], } cc_defaults { @@ -168,6 +175,10 @@ art_cc_binary { "libartbase", "libart-dexlayout", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_binary { @@ -206,6 +217,9 @@ art_cc_binary { "libartbased", "libartd-dexlayout", ], + apex_available: [ + "com.android.art.debug", + ], } art_cc_test { @@ -238,6 +252,10 @@ art_cc_binary { ], }, }, + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_test { diff --git a/dexlist/Android.bp b/dexlist/Android.bp index e1d53a2eb4..860a5fdaf9 100644 --- a/dexlist/Android.bp +++ b/dexlist/Android.bp @@ -22,6 +22,10 @@ art_cc_binary { "libartbase", "libbase", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_binary { diff --git a/dexoptanalyzer/Android.bp b/dexoptanalyzer/Android.bp index 72896c8650..7875dbbba7 100644 --- a/dexoptanalyzer/Android.bp +++ b/dexoptanalyzer/Android.bp @@ -41,6 +41,10 @@ art_cc_binary { "libart", "libartbase", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_binary { @@ -53,6 +57,9 @@ art_cc_binary { "libartd", "libartbased", ], + apex_available: [ + "com.android.art.debug", + ], } art_cc_test { diff --git a/disassembler/Android.bp b/disassembler/Android.bp index 892d0604fd..e841953c28 100644 --- a/disassembler/Android.bp +++ b/disassembler/Android.bp @@ -58,6 +58,10 @@ art_cc_library { // For disassembler_arm*. "libvixl", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_library { diff --git a/dt_fd_forward/Android.bp b/dt_fd_forward/Android.bp index 75e5c0dc88..e722a4da4e 100644 --- a/dt_fd_forward/Android.bp +++ b/dt_fd_forward/Android.bp @@ -48,6 +48,10 @@ cc_defaults { art_cc_library { name: "libdt_fd_forward", defaults: ["dt_fd_forward-defaults"], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_library { diff --git a/imgdiag/Android.bp b/imgdiag/Android.bp index 39720a0b86..7c2f515575 100644 --- a/imgdiag/Android.bp +++ b/imgdiag/Android.bp @@ -57,6 +57,10 @@ art_cc_binary { "libartbase", "libart-compiler", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_binary { @@ -70,6 +74,9 @@ art_cc_binary { "libartbased", "libartd-compiler", ], + apex_available: [ + "com.android.art.debug", + ], } art_cc_test { diff --git a/libartbase/Android.bp b/libartbase/Android.bp index 07286693da..680204133c 100644 --- a/libartbase/Android.bp +++ b/libartbase/Android.bp @@ -173,6 +173,13 @@ art_cc_library { // TODO(b/133140750): Clean this up. "//packages/modules/NetworkStack/tests:__subpackages__", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + // TODO(b/142944931) Clean this up. This is due to the dependency to libdexfile_support_static + // from /system/core, etc. + "//apex_available:platform", + ], shared_libs: [ "libbase", @@ -195,6 +202,9 @@ art_cc_library { "art_debug_defaults", "libartbase_defaults", ], + apex_available: [ + "com.android.art.debug", + ], shared_libs: [ "libbase", "libziparchive", diff --git a/libartpalette/Android.bp b/libartpalette/Android.bp index f25501d49d..2fe4cc6118 100644 --- a/libartpalette/Android.bp +++ b/libartpalette/Android.bp @@ -92,6 +92,13 @@ art_cc_library { ], }, }, + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + // TODO(b/142944931) Clean this up. This is due to the dependency to libdexfile_support_static + // from /system/core, etc. + "//apex_available:platform", + ], } art_cc_test { diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp index 2249d0a388..e9ae60337a 100644 --- a/libdexfile/Android.bp +++ b/libdexfile/Android.bp @@ -174,6 +174,13 @@ art_cc_library { ], }, }, + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + // TODO(b/142944931) Clean this up. This is due to the dependency to libdexfile_support_static + // from /system/core, etc. + "//apex_available:platform", + ], } art_cc_library { @@ -212,6 +219,9 @@ art_cc_library { ], }, }, + apex_available: [ + "com.android.art.debug", + ], } art_cc_test { @@ -298,6 +308,13 @@ cc_library { shared_libs: [ "libdexfile", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + // TODO(b/142944931) Clean this up. This is due to the dependency to libdexfile_support_static + // from /system/core, etc. + "//apex_available:platform", + ], } cc_library { @@ -314,6 +331,9 @@ cc_library { shared_libs: [ "libdexfiled", ], + apex_available: [ + "com.android.art.debug", + ], } art_cc_test { diff --git a/libelffile/Android.bp b/libelffile/Android.bp index 092a42920b..3e6cbf0133 100644 --- a/libelffile/Android.bp +++ b/libelffile/Android.bp @@ -39,6 +39,9 @@ art_cc_library_static { shared_libs: [ "libartbase", ], + apex_available: [ + "com.android.art.release", + ], } art_cc_library_static { @@ -50,4 +53,7 @@ art_cc_library_static { shared_libs: [ "libartbased", ], + apex_available: [ + "com.android.art.debug", + ], } diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp index f2db117b50..b5dc32495b 100644 --- a/libnativebridge/Android.bp +++ b/libnativebridge/Android.bp @@ -23,6 +23,10 @@ cc_library { // TODO(b/133140750): Clean this up. "//frameworks/base/native/webview/loader/libwebviewchromium_loader", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], host_supported: true, srcs: ["native_bridge.cc"], diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp index beb2c8c042..12bba441ed 100644 --- a/libnativeloader/Android.bp +++ b/libnativeloader/Android.bp @@ -18,6 +18,10 @@ cc_library { // TODO(b/133140750): Clean this up. "//frameworks/base/native/webview/loader", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], host_supported: true, srcs: [ "native_loader.cpp", diff --git a/libprofile/Android.bp b/libprofile/Android.bp index 1742a978f6..367eefc1e3 100644 --- a/libprofile/Android.bp +++ b/libprofile/Android.bp @@ -130,6 +130,10 @@ art_cc_library { ], }, }, + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_library { @@ -163,6 +167,9 @@ art_cc_library { }, }, export_shared_lib_headers: ["libbase"], + apex_available: [ + "com.android.art.debug", + ], } // For now many of these tests still use CommonRuntimeTest, almost universally because of diff --git a/oatdump/Android.bp b/oatdump/Android.bp index 64d49b47d3..e36d9d79dc 100644 --- a/oatdump/Android.bp +++ b/oatdump/Android.bp @@ -37,6 +37,10 @@ art_cc_binary { "libprofile", "libbase", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_binary { @@ -55,6 +59,9 @@ art_cc_binary { "libprofiled", "libbase", ], + apex_available: [ + "com.android.art.debug", + ], } cc_defaults { diff --git a/openjdkjvm/Android.bp b/openjdkjvm/Android.bp index a5350f98e5..ace8d0ba6a 100644 --- a/openjdkjvm/Android.bp +++ b/openjdkjvm/Android.bp @@ -34,6 +34,10 @@ art_cc_library { "libart", "libartbase", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_library { @@ -46,4 +50,7 @@ art_cc_library { "libartd", "libartbased", ], + apex_available: [ + "com.android.art.debug", + ], } diff --git a/openjdkjvmti/Android.bp b/openjdkjvmti/Android.bp index 37ae951720..9ec9dea7e1 100644 --- a/openjdkjvmti/Android.bp +++ b/openjdkjvmti/Android.bp @@ -76,6 +76,10 @@ art_cc_library { "libdexfile", "libartbase", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_library { @@ -91,4 +95,7 @@ art_cc_library { "libdexfiled", "libartbased", ], + apex_available: [ + "com.android.art.debug", + ], } diff --git a/perfetto_hprof/Android.bp b/perfetto_hprof/Android.bp index a40e7d3fa4..7627bcd4dd 100644 --- a/perfetto_hprof/Android.bp +++ b/perfetto_hprof/Android.bp @@ -79,6 +79,10 @@ art_cc_library { "libart", "libartbase", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_library { @@ -91,4 +95,7 @@ art_cc_library { "libartd", "libartbased", ], + apex_available: [ + "com.android.art.debug", + ], } diff --git a/profman/Android.bp b/profman/Android.bp index 099d555f26..c574fde442 100644 --- a/profman/Android.bp +++ b/profman/Android.bp @@ -47,6 +47,10 @@ art_cc_binary { "libdexfile", "libartbase", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_binary { @@ -60,6 +64,9 @@ art_cc_binary { "libdexfiled", "libartbased", ], + apex_available: [ + "com.android.art.debug", + ], } art_cc_binary { diff --git a/runtime/Android.bp b/runtime/Android.bp index e09d828838..2aff77d052 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -585,6 +585,10 @@ art_cc_library { }, }, }, + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_library { @@ -609,6 +613,9 @@ art_cc_library { export_shared_lib_headers: [ "libdexfiled", ], + apex_available: [ + "com.android.art.debug", + ], } art_cc_library { diff --git a/sigchainlib/Android.bp b/sigchainlib/Android.bp index a94daf3814..ac909a65a6 100644 --- a/sigchainlib/Android.bp +++ b/sigchainlib/Android.bp @@ -43,6 +43,13 @@ cc_library { }, export_include_dirs: ["."], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + // TODO(b/142944931) Clean this up. This is due to the dependency from + // app_process + "//apex_available:platform", + ], } // Create a dummy version of libsigchain which expose the necessary symbols diff --git a/simulator/Android.bp b/simulator/Android.bp index 223c891da0..1410444a3d 100644 --- a/simulator/Android.bp +++ b/simulator/Android.bp @@ -97,4 +97,7 @@ art_cc_library { "libartbased", "libartd", ], + apex_available: [ + "com.android.art.debug", + ], } diff --git a/test/Android.bp b/test/Android.bp index 00518530bb..1f763b198f 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -45,6 +45,9 @@ art_cc_defaults { cflags: [ "-Wno-frame-larger-than=", ], + apex_available: [ + "com.android.art.debug", + ], } art_cc_defaults { @@ -143,6 +146,9 @@ art_cc_defaults { enabled: false, }, }, + apex_available: [ + "com.android.art.debug", + ], } art_cc_library { @@ -168,6 +174,9 @@ art_cc_library { enabled: false, }, }, + apex_available: [ + "com.android.art.debug", + ], } // ART run-tests. diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp index ca0c7a64a0..20634fe73c 100644 --- a/tools/cpp-define-generator/Android.bp +++ b/tools/cpp-define-generator/Android.bp @@ -31,6 +31,7 @@ cc_object { // Produce text file rather than binary. cflags: ["-S"], srcs: ["asm_defines.cc"], + apex_available: ["//apex_available:platform"], } // This extracts the compile-time constants from asm_defines.s and creates the header. diff --git a/tools/dexanalyze/Android.bp b/tools/dexanalyze/Android.bp index a232a1b189..e7ae113a26 100644 --- a/tools/dexanalyze/Android.bp +++ b/tools/dexanalyze/Android.bp @@ -37,6 +37,10 @@ art_cc_binary { "libartbase", "libbase", ], + apex_available: [ + "com.android.art.release", + "com.android.art.debug", + ], } art_cc_test {