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
n4archive · Dec 20, 2019 · 066dd90 · 066dd90
1 parent fb53708
commit 066dd90
Show file tree

Hide file tree

Showing 32 changed files with 233 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {