diff options
| -rw-r--r-- | Android.mk | 40 | ||||
| -rw-r--r-- | benchmark/Android.bp | 12 | ||||
| -rw-r--r-- | benchmark/scoped-primitive-array/scoped_primitive_array.cc | 2 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 20 | ||||
| -rw-r--r-- | tools/Android.bp | 18 | ||||
| -rw-r--r-- | tools/art | 4 |
6 files changed, 40 insertions, 56 deletions
diff --git a/Android.mk b/Android.mk index d4de2e5a18..a73ae450f8 100644 --- a/Android.mk +++ b/Android.mk @@ -497,31 +497,23 @@ PRIVATE_ART_APEX_DEPENDENCY_FILES := \ bin/dalvikvm32 \ bin/dalvikvm64 \ bin/dalvikvm \ - bin/dex2oat \ - bin/dex2oatd \ + bin/dex2oat32 \ + bin/dex2oat64 \ bin/dexdump \ PRIVATE_ART_APEX_DEPENDENCY_LIBS := \ - lib/libadbconnectiond.so \ lib/libadbconnection.so \ lib/libandroidicu.so \ lib/libandroidio.so \ - lib/libartbased.so \ lib/libartbase.so \ lib/libart-compiler.so \ - lib/libartd-compiler.so \ - lib/libartd-dexlayout.so \ - lib/libartd-disassembler.so \ lib/libart-dexlayout.so \ lib/libart-disassembler.so \ - lib/libartd.so \ lib/libartpalette.so \ lib/libart.so \ lib/libbacktrace.so \ lib/libbase.so \ lib/libcrypto.so \ - lib/libdexfiled_external.so \ - lib/libdexfiled.so \ lib/libdexfile_external.so \ lib/libdexfile.so \ lib/libdexfile_support.so \ @@ -539,42 +531,29 @@ PRIVATE_ART_APEX_DEPENDENCY_LIBS := \ lib/libnativehelper.so \ lib/libnativeloader.so \ lib/libnpt.so \ - lib/libopenjdkd.so \ - lib/libopenjdkjvmd.so \ lib/libopenjdkjvm.so \ - lib/libopenjdkjvmtid.so \ lib/libopenjdkjvmti.so \ lib/libopenjdk.so \ lib/libpac.so \ lib/libprocinfo.so \ - lib/libprofiled.so \ lib/libprofile.so \ lib/libsigchain.so \ lib/libunwindstack.so \ - lib/libvixld.so \ lib/libvixl.so \ lib/libziparchive.so \ lib/libz.so \ - lib64/libadbconnectiond.so \ lib64/libadbconnection.so \ lib64/libandroidicu.so \ lib64/libandroidio.so \ - lib64/libartbased.so \ lib64/libartbase.so \ lib64/libart-compiler.so \ - lib64/libartd-compiler.so \ - lib64/libartd-dexlayout.so \ - lib64/libartd-disassembler.so \ lib64/libart-dexlayout.so \ lib64/libart-disassembler.so \ - lib64/libartd.so \ lib64/libartpalette.so \ lib64/libart.so \ lib64/libbacktrace.so \ lib64/libbase.so \ lib64/libcrypto.so \ - lib64/libdexfiled_external.so \ - lib64/libdexfiled.so \ lib64/libdexfile_external.so \ lib64/libdexfile.so \ lib64/libdexfile_support.so \ @@ -592,19 +571,14 @@ PRIVATE_ART_APEX_DEPENDENCY_LIBS := \ lib64/libnativehelper.so \ lib64/libnativeloader.so \ lib64/libnpt.so \ - lib64/libopenjdkd.so \ - lib64/libopenjdkjvmd.so \ lib64/libopenjdkjvm.so \ - lib64/libopenjdkjvmtid.so \ lib64/libopenjdkjvmti.so \ lib64/libopenjdk.so \ lib64/libpac.so \ lib64/libprocinfo.so \ - lib64/libprofiled.so \ lib64/libprofile.so \ lib64/libsigchain.so \ lib64/libunwindstack.so \ - lib64/libvixld.so \ lib64/libvixl.so \ lib64/libziparchive.so \ lib64/libz.so \ @@ -652,7 +626,7 @@ standalone-apex-files: libc.bootstrap \ libdl_android.bootstrap \ libm.bootstrap \ linker \ - $(DEBUG_ART_APEX) \ + $(RELEASE_ART_APEX) \ $(CONSCRYPT_APEX) for f in $(PRIVATE_BIONIC_FILES); do \ tf=$(TARGET_OUT)/$$f; \ @@ -663,7 +637,7 @@ standalone-apex-files: libc.bootstrap \ else \ apex_orig_dir=""; \ fi; \ - art_apex_orig_dir=$$apex_orig_dir/$(DEBUG_ART_APEX); \ + art_apex_orig_dir=$$apex_orig_dir/$(RELEASE_ART_APEX); \ for f in $(PRIVATE_ART_APEX_DEPENDENCY_LIBS) $(PRIVATE_ART_APEX_DEPENDENCY_FILES); do \ tf="$$art_apex_orig_dir/$$f"; \ df="$(TARGET_OUT)/$$f"; \ @@ -718,11 +692,9 @@ standalone-apex-files: libc.bootstrap \ # ART APEX (and TZ Data APEX). ART_TARGET_SHARED_LIBRARY_BENCHMARK := $(TARGET_OUT_SHARED_LIBRARIES)/libartbenchmark.so -build-art-target-golem: dex2oat dalvikvm linker libstdc++ \ +build-art-target-golem: $(RELEASE_ART_APEX) com.android.runtime $(CONSCRYPT_APEX) \ $(TARGET_OUT_EXECUTABLES)/art \ $(TARGET_OUT)/etc/public.libraries.txt \ - $(ART_TARGET_DEX_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 \ @@ -738,6 +710,8 @@ build-art-target-golem: dex2oat dalvikvm linker libstdc++ \ sed -i '/libdexfiled.so/d' $(TARGET_OUT)/etc/public.libraries.txt sed -i '/libprofiled.so/d' $(TARGET_OUT)/etc/public.libraries.txt sed -i '/libartbased.so/d' $(TARGET_OUT)/etc/public.libraries.txt + # The 'art' script will look for a 'com.android.art' directory. + ln -sf $(TARGET_OUT)/apex/com.android.art $(TARGET_OUT)/apex/com.android.art.release ######################################################################## # Phony target for building what go/lem requires on host. diff --git a/benchmark/Android.bp b/benchmark/Android.bp index 3995ca2022..826f944c28 100644 --- a/benchmark/Android.bp +++ b/benchmark/Android.bp @@ -25,14 +25,16 @@ art_cc_library { "micro-native/micro_native.cc", "scoped-primitive-array/scoped_primitive_array.cc", ], + cflags: [ + "-Wno-frame-larger-than=", + ], + header_libs: [ + "libnativehelper_header_only", + ], + // TODO(ngeoffray): find a way to link against the libraries in the apex. shared_libs: [ "libart", - "libbacktrace", "libbase", - "libnativehelper", - ], - cflags: [ - "-Wno-frame-larger-than=", ], } diff --git a/benchmark/scoped-primitive-array/scoped_primitive_array.cc b/benchmark/scoped-primitive-array/scoped_primitive_array.cc index 005cae4ac9..459e8b17fa 100644 --- a/benchmark/scoped-primitive-array/scoped_primitive_array.cc +++ b/benchmark/scoped-primitive-array/scoped_primitive_array.cc @@ -15,7 +15,7 @@ */ #include "jni.h" -#include "nativehelper/ScopedPrimitiveArray.h" +#include "nativehelper/scoped_primitive_array.h" extern "C" JNIEXPORT jlong JNICALL Java_ScopedPrimitiveArrayBenchmark_measureByteArray( JNIEnv* env, jclass, int reps, jbyteArray arr) { diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index f5c989202b..910d7f93b0 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -282,7 +282,7 @@ ART_GTEST_oat_file_test_HOST_DEPS := \ $(HOST_OUT_EXECUTABLES)/dex2oatd ART_GTEST_oat_file_test_TARGET_DEPS := \ $(ART_GTEST_dex2oat_environment_tests_TARGET_DEPS) \ - dex2oatd.com.android.art.debug + dex2oatd.com.android.art.testing ART_GTEST_oat_file_assistant_test_HOST_DEPS := \ $(ART_GTEST_dex2oat_environment_tests_HOST_DEPS) @@ -336,7 +336,7 @@ ART_GTEST_dexdump_test_HOST_DEPS := \ ART_GTEST_dexdump_test_TARGET_DEPS := \ $(TARGET_CORE_IMAGE_DEFAULT_64) \ $(TARGET_CORE_IMAGE_DEFAULT_32) \ - dexdump.com.android.art.debug + dexdump.com.android.art.testing # The dexanalyze test requires an image and the dexanalyze utility. ART_GTEST_dexanalyze_test_HOST_DEPS := \ @@ -346,7 +346,7 @@ ART_GTEST_dexanalyze_test_HOST_DEPS := \ ART_GTEST_dexanalyze_test_TARGET_DEPS := \ $(TARGET_CORE_IMAGE_DEFAULT_64) \ $(TARGET_CORE_IMAGE_DEFAULT_32) \ - dexanalyze.com.android.art.debug + dexanalyze.com.android.art.testing # The dexlayout test requires an image and the dexlayout utility. # TODO: rename into dexdump when migration completes @@ -358,8 +358,8 @@ ART_GTEST_dexlayout_test_HOST_DEPS := \ ART_GTEST_dexlayout_test_TARGET_DEPS := \ $(TARGET_CORE_IMAGE_DEFAULT_64) \ $(TARGET_CORE_IMAGE_DEFAULT_32) \ - dexlayoutd.com.android.art.debug \ - dexdump.com.android.art.debug + dexlayoutd.com.android.art.testing \ + dexdump.com.android.art.testing # The dexlist test requires an image and the dexlist utility. ART_GTEST_dexlist_test_HOST_DEPS := \ @@ -381,13 +381,13 @@ ART_GTEST_imgdiag_test_HOST_DEPS := \ ART_GTEST_imgdiag_test_TARGET_DEPS := \ $(TARGET_CORE_IMAGE_DEFAULT_64) \ $(TARGET_CORE_IMAGE_DEFAULT_32) \ - imgdiagd.com.android.art.debug + imgdiagd.com.android.art.testing # Dex analyze test requires dexanalyze. ART_GTEST_dexanalyze_test_HOST_DEPS := \ $(HOST_OUT_EXECUTABLES)/dexanalyze ART_GTEST_dexanalyze_test_TARGET_DEPS := \ - dexanalyze.com.android.art.debug + dexanalyze.com.android.art.testing # Oatdump test requires an image and oatfile to dump. ART_GTEST_oatdump_test_HOST_DEPS := \ @@ -628,9 +628,9 @@ endef # define-art-gtest-host-both ifeq ($(ART_BUILD_TARGET),true) $(foreach name,$(ART_TARGET_GTEST_NAMES), $(eval $(call add-art-gtest-dependencies,$(name),))) ART_TEST_TARGET_GTEST_DEPENDENCIES += \ - libicu_jni.com.android.art.debug \ - libjavacore.com.android.art.debug \ - libopenjdkd.com.android.art.debug \ + libicu_jni.com.android.art.testing \ + libjavacore.com.android.art.testing \ + libopenjdkd.com.android.art.testing \ com.android.art.testing \ com.android.conscrypt endif diff --git a/tools/Android.bp b/tools/Android.bp index d38e218ef7..d932d03271 100644 --- a/tools/Android.bp +++ b/tools/Android.bp @@ -35,9 +35,17 @@ sh_binary { host_supported: true, src: "art", filename_from_src: true, - required: [ - "dalvikvm", - "dex2oat", - "dex2oatd", - ], + target: { + android: { + required: [ + "com.android.art.release", + ], + }, + host: { + required: [ + "dalvikvm", + "dex2oat", + ], + }, + }, } @@ -541,9 +541,9 @@ if [[ "$DEX2OAT_BOOT_IMAGE" = *core*.art && "$DEX2OAT_BCP" = "" ]]; then if [[ ${core_locations_dir:0:${#prefix}} = $prefix ]]; then core_locations_dir="${core_locations_dir##$prefix}" fi - elif [[ -e $ANDROID_ROOT/apex/com.android.art.debug/javalib/core-oj.jar ]]; then + elif [[ -e $ANDROID_ROOT/apex/com.android.art/javalib/core-oj.jar ]]; then core_jars_suffix= - core_filenames_dir=$ANDROID_ROOT/apex/com.android.art.debug/javalib + core_filenames_dir=$ANDROID_ROOT/apex/com.android.art/javalib core_locations_dir=/apex/com.android.art/javalib else echo "Can not find jar files for boot image $DEX2OAT_BOOT_IMAGE" |