Revert submission 1191937-art_apex_available
Original Commit Message:
"""
Rename modules that are APEX-only
The renamed modules are only available for APEXes, but not for the
platform. Use the <module_name>.<apex_name> syntax to correctly install
the APEX variant of the modules.
"""
Reason for revert: Build Cop - Breaks about 15 AOSP targets, with high confidence due to these changes being the only non-robot changes in those builds.
Reverted Changes:
I190ce2d10:Use apex_available property
I990e0a67e:Use apex_available property
I0d1295683:Revert "Avoid duplicated classes for boot dex jars...
I5fb725403:Find the jar libraries in APEX from the correct pa...
I322b1efcc:Rename modules that are APEX-only
Ifa2bd0f8f:Use apex_available property
Iac6533177:Use apex_available property
Ie999602c6:Use apex_available property
I2a3d73397:Use apex_available property
Ic91bcbb9a:Use apex_available property
Ia6c324eed:Use apex_available property
I964d0125c:Use apex_available property
Change-Id: I1eb30e355cfce316b94cde0dd176002af8d222bb
diff --git a/Android.mk b/Android.mk
index 467490f..36e5b90 100644
--- a/Android.mk
+++ b/Android.mk
@@ -407,16 +407,16 @@
# Base requirements.
LOCAL_REQUIRED_MODULES := \
- 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 \
+ dalvikvm \
+ dex2oat \
+ dexoptanalyzer \
+ libart \
+ libart-compiler \
+ libopenjdkjvm \
+ libopenjdkjvmti \
+ profman \
+ libadbconnection \
+ libperfetto_hprof \
# Potentially add in debug variants:
#
@@ -430,16 +430,16 @@
endif
ifeq (true,$(art_target_include_debug_build))
LOCAL_REQUIRED_MODULES += \
- 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 \
+ dex2oatd \
+ dexoptanalyzerd \
+ libartd \
+ libartd-compiler \
+ libopenjdkd \
+ libopenjdkjvmd \
+ libopenjdkjvmtid \
+ profmand \
+ libadbconnectiond \
+ libperfetto_hprofd \
endif
endif
@@ -625,7 +625,7 @@
$(TARGET_OUT_EXECUTABLES)/art \
$(TARGET_OUT)/etc/public.libraries.txt \
$(ART_TARGET_DEX_DEPENDENCIES) \
- $(ART_DEBUG_TARGET_SHARED_LIBRARY_DEPENDENCIES) \
+ $(ART_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 b2503e1..239cecb 100644
--- a/adbconnection/Android.bp
+++ b/adbconnection/Android.bp
@@ -53,10 +53,6 @@
"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
@@ -95,7 +91,4 @@
"libartd",
"libartbased",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 4cc408e..df35bd8 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -111,11 +111,10 @@
ART_HOST_SHARED_LIBRARY_DEBUG_DEPENDENCIES += $(foreach lib,$(ART_CORE_SHARED_DEBUG_LIBRARIES), $(2ND_HOST_OUT_SHARED_LIBRARIES)/$(lib).so)
endif
-# 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_DEPENDENCIES := $(foreach lib,$(ART_CORE_SHARED_LIBRARIES), $(TARGET_OUT_SHARED_LIBRARIES)/$(lib).so)
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 abc8f6f..c9f05b5 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -500,15 +500,13 @@
# 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) \
- libicu_jni.com.android.art.debug \
- libjavacore.com.android.art.debug \
- libopenjdkd.com.android.art.debug \
+ $$($(3)TARGET_OUT_SHARED_LIBRARIES)/libicu_jni.so \
+ $$($(3)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \
+ $$($(3)TARGET_OUT_SHARED_LIBRARIES)/libopenjdkd.so \
$$(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 532f7d6..dfd71f1 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -266,10 +266,6 @@
},
},
},
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
cc_defaults {
@@ -334,9 +330,6 @@
"libdexfiled",
],
whole_static_libs: ["libelffiled"],
- apex_available: [
- "com.android.art.debug",
- ],
}
cc_defaults {
diff --git a/dalvikvm/Android.bp b/dalvikvm/Android.bp
index 8cd8819..0688318 100644
--- a/dalvikvm/Android.bp
+++ b/dalvikvm/Android.bp
@@ -54,8 +54,4 @@
// 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 635a3d3..14bca00 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -118,9 +118,6 @@
"libartpalette",
"libprofile",
],
- apex_available: [
- "com.android.art.release",
- ],
}
cc_defaults {
@@ -150,9 +147,6 @@
"libartpalette",
"libprofiled",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
cc_defaults {
@@ -289,10 +283,6 @@
],
},
},
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_binary {
@@ -340,9 +330,6 @@
suffix: "64",
},
},
- apex_available: [
- "com.android.art.debug",
- ],
}
cc_defaults {
diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index 0bbb001..f46b4de 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -52,11 +52,6 @@
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 cd40620..65bb92c 100644
--- a/dexlayout/Android.bp
+++ b/dexlayout/Android.bp
@@ -94,10 +94,6 @@
],
},
},
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
cc_defaults {
@@ -140,9 +136,6 @@
],
},
},
- apex_available: [
- "com.android.art.debug",
- ],
}
cc_defaults {
@@ -175,10 +168,6 @@
"libartbase",
"libart-dexlayout",
],
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_binary {
@@ -217,9 +206,6 @@
"libartbased",
"libartd-dexlayout",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
art_cc_test {
@@ -252,10 +238,6 @@
],
},
},
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_test {
diff --git a/dexlist/Android.bp b/dexlist/Android.bp
index 860a5fd..e1d53a2 100644
--- a/dexlist/Android.bp
+++ b/dexlist/Android.bp
@@ -22,10 +22,6 @@
"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 7875dbb..72896c8 100644
--- a/dexoptanalyzer/Android.bp
+++ b/dexoptanalyzer/Android.bp
@@ -41,10 +41,6 @@
"libart",
"libartbase",
],
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_binary {
@@ -57,9 +53,6 @@
"libartd",
"libartbased",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
art_cc_test {
diff --git a/disassembler/Android.bp b/disassembler/Android.bp
index e841953..892d060 100644
--- a/disassembler/Android.bp
+++ b/disassembler/Android.bp
@@ -58,10 +58,6 @@
// 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 e722a4d..75e5c0d 100644
--- a/dt_fd_forward/Android.bp
+++ b/dt_fd_forward/Android.bp
@@ -48,10 +48,6 @@
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 7c2f515..39720a0 100644
--- a/imgdiag/Android.bp
+++ b/imgdiag/Android.bp
@@ -57,10 +57,6 @@
"libartbase",
"libart-compiler",
],
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_binary {
@@ -74,9 +70,6 @@
"libartbased",
"libartd-compiler",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
art_cc_test {
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 6802041..0728669 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -173,13 +173,6 @@
// 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",
@@ -202,9 +195,6 @@
"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 2fe4cc6..f25501d 100644
--- a/libartpalette/Android.bp
+++ b/libartpalette/Android.bp
@@ -92,13 +92,6 @@
],
},
},
- 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 e9ae603..2249d0a 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -174,13 +174,6 @@
],
},
},
- 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 {
@@ -219,9 +212,6 @@
],
},
},
- apex_available: [
- "com.android.art.debug",
- ],
}
art_cc_test {
@@ -308,13 +298,6 @@
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 {
@@ -331,9 +314,6 @@
shared_libs: [
"libdexfiled",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
art_cc_test {
diff --git a/libelffile/Android.bp b/libelffile/Android.bp
index 3e6cbf0..092a429 100644
--- a/libelffile/Android.bp
+++ b/libelffile/Android.bp
@@ -39,9 +39,6 @@
shared_libs: [
"libartbase",
],
- apex_available: [
- "com.android.art.release",
- ],
}
art_cc_library_static {
@@ -53,7 +50,4 @@
shared_libs: [
"libartbased",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index b5dc324..f2db117b 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -23,10 +23,6 @@
// 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 12bba44..beb2c8c 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -18,10 +18,6 @@
// 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 367eefc..1742a97 100644
--- a/libprofile/Android.bp
+++ b/libprofile/Android.bp
@@ -130,10 +130,6 @@
],
},
},
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_library {
@@ -167,9 +163,6 @@
},
},
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 e36d9d7..64d49b4 100644
--- a/oatdump/Android.bp
+++ b/oatdump/Android.bp
@@ -37,10 +37,6 @@
"libprofile",
"libbase",
],
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_binary {
@@ -59,9 +55,6 @@
"libprofiled",
"libbase",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
cc_defaults {
diff --git a/openjdkjvm/Android.bp b/openjdkjvm/Android.bp
index ace8d0b..a5350f9 100644
--- a/openjdkjvm/Android.bp
+++ b/openjdkjvm/Android.bp
@@ -34,10 +34,6 @@
"libart",
"libartbase",
],
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_library {
@@ -50,7 +46,4 @@
"libartd",
"libartbased",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
diff --git a/openjdkjvmti/Android.bp b/openjdkjvmti/Android.bp
index 9ec9dea..37ae951 100644
--- a/openjdkjvmti/Android.bp
+++ b/openjdkjvmti/Android.bp
@@ -76,10 +76,6 @@
"libdexfile",
"libartbase",
],
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_library {
@@ -95,7 +91,4 @@
"libdexfiled",
"libartbased",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
diff --git a/perfetto_hprof/Android.bp b/perfetto_hprof/Android.bp
index 7627bcd..a40e7d3 100644
--- a/perfetto_hprof/Android.bp
+++ b/perfetto_hprof/Android.bp
@@ -79,10 +79,6 @@
"libart",
"libartbase",
],
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_library {
@@ -95,7 +91,4 @@
"libartd",
"libartbased",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
diff --git a/profman/Android.bp b/profman/Android.bp
index c574fde..099d555 100644
--- a/profman/Android.bp
+++ b/profman/Android.bp
@@ -47,10 +47,6 @@
"libdexfile",
"libartbase",
],
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_binary {
@@ -64,9 +60,6 @@
"libdexfiled",
"libartbased",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
art_cc_binary {
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 2aff77d..e09d828 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -585,10 +585,6 @@
},
},
},
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_library {
@@ -613,9 +609,6 @@
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 ac909a6..a94daf3 100644
--- a/sigchainlib/Android.bp
+++ b/sigchainlib/Android.bp
@@ -43,13 +43,6 @@
},
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 1410444..223c891 100644
--- a/simulator/Android.bp
+++ b/simulator/Android.bp
@@ -97,7 +97,4 @@
"libartbased",
"libartd",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
diff --git a/test/Android.bp b/test/Android.bp
index 1f763b1..0051853 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -45,9 +45,6 @@
cflags: [
"-Wno-frame-larger-than=",
],
- apex_available: [
- "com.android.art.debug",
- ],
}
art_cc_defaults {
@@ -146,9 +143,6 @@
enabled: false,
},
},
- apex_available: [
- "com.android.art.debug",
- ],
}
art_cc_library {
@@ -174,9 +168,6 @@
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 20634fe..ca0c7a6 100644
--- a/tools/cpp-define-generator/Android.bp
+++ b/tools/cpp-define-generator/Android.bp
@@ -31,7 +31,6 @@
// 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 e7ae113..a232a1b 100644
--- a/tools/dexanalyze/Android.bp
+++ b/tools/dexanalyze/Android.bp
@@ -37,10 +37,6 @@
"libartbase",
"libbase",
],
- apex_available: [
- "com.android.art.release",
- "com.android.art.debug",
- ],
}
art_cc_test {
