diff options
| author | Elliott Hughes <enh@google.com> | 2012-11-07 18:31:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-07 18:31:35 -0800 |
| commit | d125adca42283777f08abae3171623048fa94b8a (patch) | |
| tree | 63b4e34c5e67d8ec2ce4c34896669a9f8fcbdc15 | |
| parent | a481e46b9ac2c18d6bea3fb828429b3fdaa7ec66 (diff) | |
| parent | ef9744f7ee4fd2315f41c58ba48906d9d79363dd (diff) | |
| download | build-d125adca42283777f08abae3171623048fa94b8a.zip build-d125adca42283777f08abae3171623048fa94b8a.tar.gz build-d125adca42283777f08abae3171623048fa94b8a.tar.bz2 | |
am ef9744f7: Merge "Remove manual WITH_JIT setting from build/."
* commit 'ef9744f7ee4fd2315f41c58ba48906d9d79363dd':
Remove manual WITH_JIT setting from build/.
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 5 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 0122411..dd7a8f0 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -242,11 +242,6 @@ TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm TARGET_CUSTOM_LD_COMMAND := true -# Enable the Dalvik JIT compiler if not already specified. -ifeq ($(strip $(WITH_JIT)),) - WITH_JIT := true -endif - define transform-o-to-shared-lib-inner $(hide) $(PRIVATE_CXX) \ -nostdlib -Wl,-soname,$(notdir $@) \ diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index da1f360..6e9cd01 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -214,11 +214,6 @@ TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm TARGET_CUSTOM_LD_COMMAND := true -# Enable the Dalvik JIT compiler if not already specified. -ifeq ($(strip $(WITH_JIT)),) - WITH_JIT := true -endif - define transform-o-to-shared-lib-inner $(hide) $(PRIVATE_CXX) \ -nostdlib -Wl,-soname,$(notdir $@) \ |