Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0df9d95 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"

parents f2a2406b 3f5ff08d
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -334,16 +334,18 @@ ifneq (,$(user_variant))
    enable_target_debugging :=
  endif

  # Turn on Dalvik preoptimization for user builds, but only if not
  # Turn on Dalvik preoptimization for libdvm.so user builds, but only if not
  # explicitly disabled and the build is running on Linux (since host
  # Dalvik isn't built for non-Linux hosts).
  ifeq (,$(WITH_DEXPREOPT))
    ifeq ($(DALVIK_VM_LIB),libdvm.so)
      ifeq ($(user_variant),user)
        ifeq ($(HOST_OS),linux)
          WITH_DEXPREOPT := true
        endif
      endif
    endif
  endif

  # Disallow mock locations by default for user builds
  ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0