diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:50 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:50 -0700 |
| commit | 04a4d9a0fc8bacd1c6360c3d1fc38bc76b69fac6 (patch) | |
| tree | effb5f0010f492ff078b6ce2eb9e276568a3065b | |
| parent | bb94ebec5fec765c155e1fd141babd648af94d2b (diff) | |
| download | android_development-04a4d9a0fc8bacd1c6360c3d1fc38bc76b69fac6.tar.gz android_development-04a4d9a0fc8bacd1c6360c3d1fc38bc76b69fac6.tar.bz2 android_development-04a4d9a0fc8bacd1c6360c3d1fc38bc76b69fac6.zip | |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I3af1c8fb9b1b558a1c03212a2bb1834095c806da
| -rw-r--r-- | samples/RenderScript/Balls/Android.mk | 4 | ||||
| -rw-r--r-- | samples/RenderScript/Fountain/Android.mk | 4 | ||||
| -rw-r--r-- | samples/RenderScript/HelloCompute/Android.mk | 4 | ||||
| -rw-r--r-- | samples/RenderScript/HelloWorld/Android.mk | 4 | ||||
| -rw-r--r-- | samples/RenderScript/MiscSamples/Android.mk | 4 | ||||
| -rw-r--r-- | testrunner/tests/Android_gtestlib.mk | 4 |
6 files changed, 0 insertions, 24 deletions
diff --git a/samples/RenderScript/Balls/Android.mk b/samples/RenderScript/Balls/Android.mk index 38997523f..b10958493 100644 --- a/samples/RenderScript/Balls/Android.mk +++ b/samples/RenderScript/Balls/Android.mk @@ -14,8 +14,6 @@ # limitations under the License. # -ifneq ($(TARGET_SIMULATOR),true) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -26,5 +24,3 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil LOCAL_PACKAGE_NAME := RsBalls include $(BUILD_PACKAGE) - -endif diff --git a/samples/RenderScript/Fountain/Android.mk b/samples/RenderScript/Fountain/Android.mk index 27994bac4..ecc330c87 100644 --- a/samples/RenderScript/Fountain/Android.mk +++ b/samples/RenderScript/Fountain/Android.mk @@ -14,8 +14,6 @@ # limitations under the License. # -ifneq ($(TARGET_SIMULATOR),true) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -26,5 +24,3 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil LOCAL_PACKAGE_NAME := RsFountain include $(BUILD_PACKAGE) - -endif diff --git a/samples/RenderScript/HelloCompute/Android.mk b/samples/RenderScript/HelloCompute/Android.mk index 27bc92e13..e19f35103 100644 --- a/samples/RenderScript/HelloCompute/Android.mk +++ b/samples/RenderScript/HelloCompute/Android.mk @@ -14,8 +14,6 @@ # limitations under the License. # -ifneq ($(TARGET_SIMULATOR),true) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -27,5 +25,3 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PACKAGE_NAME := RsHelloCompute include $(BUILD_PACKAGE) - -endif diff --git a/samples/RenderScript/HelloWorld/Android.mk b/samples/RenderScript/HelloWorld/Android.mk index 2e194ef8a..48a6ffdb8 100644 --- a/samples/RenderScript/HelloWorld/Android.mk +++ b/samples/RenderScript/HelloWorld/Android.mk @@ -14,8 +14,6 @@ # limitations under the License. # -ifneq ($(TARGET_SIMULATOR),true) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -26,5 +24,3 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil LOCAL_PACKAGE_NAME := RsHelloWorld include $(BUILD_PACKAGE) - -endif diff --git a/samples/RenderScript/MiscSamples/Android.mk b/samples/RenderScript/MiscSamples/Android.mk index fcdefb789..6bab9c636 100644 --- a/samples/RenderScript/MiscSamples/Android.mk +++ b/samples/RenderScript/MiscSamples/Android.mk @@ -14,8 +14,6 @@ # limitations under the License. # -ifneq ($(TARGET_SIMULATOR),true) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -26,5 +24,3 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil LOCAL_PACKAGE_NAME := RsMiscSamples include $(BUILD_PACKAGE) - -endif diff --git a/testrunner/tests/Android_gtestlib.mk b/testrunner/tests/Android_gtestlib.mk index 0d3ec8faf..79ecec65e 100644 --- a/testrunner/tests/Android_gtestlib.mk +++ b/testrunner/tests/Android_gtestlib.mk @@ -16,8 +16,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -ifneq ($(TARGET_SIMULATOR),true) - # Build the unit tests. test_src_files := $(call find-subdir-files, *.cpp) @@ -52,5 +50,3 @@ $(foreach file,$(test_src_files), \ $(eval LOCAL_MODULE_TAGS := $(module_tags)) \ $(eval include $(BUILD_EXECUTABLE)) \ ) - -endif |