ART: Apply --no-inline-from= option on device.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: Manually check that compiling boot image with
appropriate options on host and on device yields
identical results.
Bug: 119436742
Change-Id: I1617a601a3a82e2ebd687a6b53e7e8a7ff610d87
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index d85bfd5..45d9167 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -1418,10 +1418,6 @@
static inline bool MayInline(const CompilerOptions& compiler_options,
const DexFile& inlined_from,
const DexFile& inlined_into) {
- if (kIsTargetBuild) {
- return true;
- }
-
// We're not allowed to inline across dex files if we're the no-inline-from dex file.
if (!IsSameDexFile(inlined_from, inlined_into) &&
ContainsElement(compiler_options.GetNoInlineFromDexFile(), &inlined_from)) {