diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:48 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:48 -0700 |
| commit | 737e7c2b77b026ab44c6bbf775b77e953b6f79c6 (patch) | |
| tree | 6360348f8c4088f4a4208a5d26c50f521511cc5b | |
| parent | ea333384b92db9c400be1b4c8cb6992d9ba5f14d (diff) | |
| download | android_dalvik-737e7c2b77b026ab44c6bbf775b77e953b6f79c6.tar.gz android_dalvik-737e7c2b77b026ab44c6bbf775b77e953b6f79c6.tar.bz2 android_dalvik-737e7c2b77b026ab44c6bbf775b77e953b6f79c6.zip | |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I544b54b673d9fd42197a5c97a291578a0bd0db5f
| -rw-r--r-- | dexdump/Android.mk | 2 | ||||
| -rw-r--r-- | dexlist/Android.mk | 4 | ||||
| -rw-r--r-- | dexopt/Android.mk | 6 | ||||
| -rw-r--r-- | vm/Android.mk | 1 | ||||
| -rw-r--r-- | vm/Dvm.mk | 14 | ||||
| -rw-r--r-- | vm/ReconfigureDvm.mk | 12 |
6 files changed, 6 insertions, 33 deletions
diff --git a/dexdump/Android.mk b/dexdump/Android.mk index e47acfa5c..7c22b600a 100644 --- a/dexdump/Android.mk +++ b/dexdump/Android.mk @@ -63,7 +63,6 @@ endif # !SDK_ONLY ## Build the host command line tool dexdump ## ## -ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean include $(CLEAR_VARS) LOCAL_MODULE := dexdump LOCAL_MODULE_TAGS := optional @@ -79,4 +78,3 @@ LOCAL_LDLIBS += -lpthread -lz endif include $(BUILD_HOST_EXECUTABLE) -endif # !TARGET_SIMULATOR diff --git a/dexlist/Android.mk b/dexlist/Android.mk index a7dd6e280..55602dd36 100644 --- a/dexlist/Android.mk +++ b/dexlist/Android.mk @@ -29,8 +29,6 @@ dexdump_shared_libraries := dexdump_static_libraries := \ libdex -ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean - include $(CLEAR_VARS) LOCAL_MODULE := dexlist LOCAL_MODULE_TAGS := optional @@ -50,5 +48,3 @@ LOCAL_SHARED_LIBRARIES := $(dexdump_shared_libraries) LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) libcutils LOCAL_LDLIBS += -lpthread -lz include $(BUILD_HOST_EXECUTABLE) - -endif # TARGET_SIMULATOR diff --git a/dexopt/Android.mk b/dexopt/Android.mk index df8a82feb..d4831d10f 100644 --- a/dexopt/Android.mk +++ b/dexopt/Android.mk @@ -47,10 +47,8 @@ LOCAL_SHARED_LIBRARIES := $(local_shared_libraries) libcutils libexpat liblog li LOCAL_MODULE_TAGS := optional LOCAL_MODULE := dexopt -ifneq ($(TARGET_SIMULATOR),true) - LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include - LOCAL_SHARED_LIBRARIES += libstlport -endif +LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include +LOCAL_SHARED_LIBRARIES += libstlport include $(BUILD_EXECUTABLE) diff --git a/vm/Android.mk b/vm/Android.mk index b1f3d0d46..17b5a0415 100644 --- a/vm/Android.mk +++ b/vm/Android.mk @@ -96,7 +96,6 @@ ifeq ($(WITH_HOST_DALVIK),true) dvm_arch := $(HOST_ARCH) # Note: HOST_ARCH_VARIANT isn't defined. dvm_arch_variant := $(HOST_ARCH) - dvm_simulator := false WITH_JIT := false include $(LOCAL_PATH)/Dvm.mk @@ -35,11 +35,7 @@ LOCAL_CFLAGS += -DARCH_VARIANT=\"$(dvm_arch_variant)\" # Make a debugging version when building the simulator (if not told # otherwise) and when explicitly asked. dvm_make_debug_vm := false -ifeq ($(strip $(DEBUG_DALVIK_VM)),) - ifeq ($(dvm_simulator),true) - dvm_make_debug_vm := true - endif -else +ifneq ($(strip $(DEBUG_DALVIK_VM)),) dvm_make_debug_vm := $(DEBUG_DALVIK_VM) endif @@ -231,14 +227,6 @@ LOCAL_C_INCLUDES += \ external/zlib \ libcore/include \ -ifeq ($(dvm_simulator),true) - LOCAL_LDLIBS += -lpthread -ldl - ifeq ($(HOST_OS),linux) - # need this for clock_gettime() in profiling - LOCAL_LDLIBS += -lrt - endif -endif - MTERP_ARCH_KNOWN := false ifeq ($(dvm_arch),arm) diff --git a/vm/ReconfigureDvm.mk b/vm/ReconfigureDvm.mk index add82d24f..20e562635 100644 --- a/vm/ReconfigureDvm.mk +++ b/vm/ReconfigureDvm.mk @@ -18,7 +18,6 @@ include $(CLEAR_VARS) dvm_os := $(TARGET_OS) dvm_arch := $(TARGET_ARCH) dvm_arch_variant := $(TARGET_ARCH_VARIANT) -dvm_simulator := $(TARGET_SIMULATOR) # for now, disable x86-atom variant ifeq ($(dvm_arch_variant),x86-atom) @@ -27,17 +26,12 @@ endif include $(LOCAL_PATH)/Dvm.mk -LOCAL_SHARED_LIBRARIES += liblog libcutils libnativehelper libz -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif # !TARGET_SIMULATOR +LOCAL_SHARED_LIBRARIES += liblog libcutils libnativehelper libz libdl LOCAL_STATIC_LIBRARIES += libdex -ifneq ($(TARGET_SIMULATOR),true) - LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include - LOCAL_SHARED_LIBRARIES += libstlport -endif +LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include +LOCAL_SHARED_LIBRARIES += libstlport # Don't install on any build by default LOCAL_MODULE_TAGS := optional |