diff options
| -rw-r--r-- | build/Android.gtest.mk | 2 | ||||
| -rw-r--r-- | build/apex/Android.bp | 6 | ||||
| -rw-r--r-- | dex2oat/Android.bp | 2 | ||||
| -rw-r--r-- | oatdump/Android.bp | 2 | ||||
| -rw-r--r-- | runtime/Android.bp | 2 | ||||
| -rw-r--r-- | sigchainlib/Android.bp | 10 | ||||
| -rw-r--r-- | sigchainlib/sigchain_fake.cc (renamed from sigchainlib/sigchain_dummy.cc) | 2 | ||||
| -rw-r--r-- | tools/art_verifier/Android.bp | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 9fcddf68ab..1d31e747ba 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -44,7 +44,7 @@ my_files += \ $(HOST_OUT_JAVA_LIBRARIES)/core-icu4j-hostdex.jar:apex/com.android.i18n/javalib/core-icu4j.jar \ $(icu_data_file):com.android.i18n/etc/icu/$(notdir $(icu_data_file)) -# Create a module that will copy all the data files into testcases directory. +# Create phony module that will copy all the data files into testcases directory. # For now, this copies everything to "out/host/linux-x86/" subdirectory, since it # is hard-coded in many places. TODO: Refactor tests to remove the need for this. include $(CLEAR_VARS) diff --git a/build/apex/Android.bp b/build/apex/Android.bp index 99993e4b66..b99742b4a7 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -411,7 +411,7 @@ genrule { " --flavor release" + " $(in)" + " && touch $(out)", - out: ["art-check-release-apex-gen.dummy"], + out: ["art-check-release-apex-gen.unused"], } cc_prebuilt_binary { @@ -428,7 +428,7 @@ genrule { " --flavor debug" + " $(in)" + " && touch $(out)", - out: ["art-check-debug-apex-gen.dummy"], + out: ["art-check-debug-apex-gen.unused"], } cc_prebuilt_binary { @@ -445,7 +445,7 @@ genrule { " --flavor testing" + " $(in)" + " && touch $(out)", - out: ["art-check-testing-apex-gen.dummy"], + out: ["art-check-testing-apex-gen.unused"], } cc_prebuilt_binary { diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp index 1248f232f6..b6c942d764 100644 --- a/dex2oat/Android.bp +++ b/dex2oat/Android.bp @@ -360,7 +360,7 @@ cc_defaults { ], static_libs: [ "libbase", - "libsigchain_dummy", + "libsigchain_fake", "libz", ], } diff --git a/oatdump/Android.bp b/oatdump/Android.bp index 643d2e792e..5d53d45dd6 100644 --- a/oatdump/Android.bp +++ b/oatdump/Android.bp @@ -84,7 +84,7 @@ cc_defaults { // Try to get rid of it. "-z muldefs", ], - static_libs: ["libsigchain_dummy"], + static_libs: ["libsigchain_fake"], } art_cc_binary { diff --git a/runtime/Android.bp b/runtime/Android.bp index 1eeac26168..c21c060a9d 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -473,7 +473,7 @@ libart_static_cc_defaults { "liblog", "libnativebridge", "libnativeloader", - "libsigchain_dummy", + "libsigchain_fake", "libunwindstack", "libz", ], diff --git a/sigchainlib/Android.bp b/sigchainlib/Android.bp index 6225e0c6d9..e42bb8ef4b 100644 --- a/sigchainlib/Android.bp +++ b/sigchainlib/Android.bp @@ -30,7 +30,7 @@ cc_library { target: { linux: { shared: { - srcs: ["sigchain_dummy.cc"], + srcs: ["sigchain_fake.cc"], }, static: { srcs: ["sigchain.cc"], @@ -38,7 +38,7 @@ cc_library { }, darwin: { - srcs: ["sigchain_dummy.cc"], + srcs: ["sigchain_fake.cc"], }, android: { @@ -56,14 +56,14 @@ cc_library { ], } -// Create a dummy version of libsigchain which expose the necessary symbols +// Create a fake version of libsigchain which expose the necessary symbols // but throws when called. This can be used to get static binaries which don't // need the real functionality of the sig chain but need to please the linker. cc_library_static { - name: "libsigchain_dummy", + name: "libsigchain_fake", host_supported: true, defaults: ["art_defaults"], - srcs: ["sigchain_dummy.cc"], + srcs: ["sigchain_fake.cc"], target: { android: { whole_static_libs: ["libasync_safe"], diff --git a/sigchainlib/sigchain_dummy.cc b/sigchainlib/sigchain_fake.cc index db72b585eb..23861540fc 100644 --- a/sigchainlib/sigchain_dummy.cc +++ b/sigchainlib/sigchain_fake.cc @@ -22,7 +22,7 @@ #define ATTRIBUTE_UNUSED __attribute__((__unused__)) -// We cannot annotate the declarations, as they are not no-return in the non-dummy version. +// We cannot annotate the declarations, as they are not no-return in the non-fake version. #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wmissing-noreturn" diff --git a/tools/art_verifier/Android.bp b/tools/art_verifier/Android.bp index 72327d5210..f505d8f128 100644 --- a/tools/art_verifier/Android.bp +++ b/tools/art_verifier/Android.bp @@ -28,7 +28,7 @@ art_cc_defaults { "art_cmdlineparser_headers", ], static_libs: [ - "libsigchain_dummy", + "libsigchain_fake", ], target: { android: { |