diff options
author | Elliott Hughes <enh@google.com> | 2012-09-04 13:42:57 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-04 13:42:57 -0700 |
commit | 1db615b4ae469c9f33dc1d88b24924ca8efc10ef (patch) | |
tree | 2064bbfedd11f692652778186f5f72d9d7bbcaa8 | |
parent | 6fe901ef38898d9cb6007720940e915f7180fc11 (diff) | |
parent | 5ac9eee1d3291a0d203a125849b4636a11c0d124 (diff) | |
download | android_bionic-1db615b4ae469c9f33dc1d88b24924ca8efc10ef.tar.gz android_bionic-1db615b4ae469c9f33dc1d88b24924ca8efc10ef.tar.bz2 android_bionic-1db615b4ae469c9f33dc1d88b24924ca8efc10ef.zip |
Merge "bionic: Fix TINY_ANDROID build"
-rw-r--r-- | tests/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index d50d4d7d9..ba1112e2d 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -12,7 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# Copyright The Android Open Source Project +# + +ifneq ($(BUILD_TINY_ANDROID), true) LOCAL_PATH := $(call my-dir) @@ -35,3 +37,5 @@ include $(CLEAR_VARS) LOCAL_MODULE := bionic-unit-tests-glibc LOCAL_SRC_FILES := $(test_src_files) include $(BUILD_HOST_NATIVE_TEST) + +endif # !BUILD_TINY_ANDROID |