diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:46 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 23:51:37 -0700 |
| commit | e33ba4c49ed461d608c65eb4e09d31ca81d167ff (patch) | |
| tree | 1fcc76ec2875c51aa941ebadd70e7609c0faf7c6 /core/dumpvar.mk | |
| parent | 18a298e7bc39310b844e3587345e71495a9f4bb6 (diff) | |
| download | build-e33ba4c49ed461d608c65eb4e09d31ca81d167ff.tar.gz build-e33ba4c49ed461d608c65eb4e09d31ca81d167ff.tar.bz2 build-e33ba4c49ed461d608c65eb4e09d31ca81d167ff.zip | |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
Diffstat (limited to 'core/dumpvar.mk')
| -rw-r--r-- | core/dumpvar.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 831ed973e..e0de464f4 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -5,14 +5,10 @@ ifeq ($(CALLED_FROM_SETUP),true) ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) -ifeq ($(TARGET_SIMULATOR),true) - ABP:=$(ABP):$(TARGET_OUT_EXECUTABLES) -else - # Add the toolchain bin dir if it actually exists - ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),) - # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin - endif +# Add the toolchain bin dir if it actually exists +ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),) + # this should be copied to HOST_OUT_EXECUTABLES instead + ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin endif ANDROID_BUILD_PATHS := $(ABP) ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG) @@ -68,7 +64,6 @@ $(info PLATFORM_VERSION_CODENAME=$(PLATFORM_VERSION_CODENAME)) $(info PLATFORM_VERSION=$(PLATFORM_VERSION)) $(info TARGET_PRODUCT=$(TARGET_PRODUCT)) $(info TARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT)) -$(info TARGET_SIMULATOR=$(TARGET_SIMULATOR)) $(info TARGET_BUILD_TYPE=$(TARGET_BUILD_TYPE)) $(info TARGET_BUILD_APPS=$(TARGET_BUILD_APPS)) $(info TARGET_ARCH=$(TARGET_ARCH)) |