diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-28 17:45:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 17:45:13 +0000 |
| commit | 06caf1b1112a6a3e364a46d02b883451e9180a07 (patch) | |
| tree | 1b2396173bdb30ffe6f0c19c7f638b41f9cef9c7 /libs | |
| parent | 93e40ba6c4373402c7c4f430e3e575e4a0cc13eb (diff) | |
| parent | 31b76b66b1678eb6483676aa2ef587e10b98d02a (diff) | |
| download | frameworks_base-06caf1b1112a6a3e364a46d02b883451e9180a07.zip frameworks_base-06caf1b1112a6a3e364a46d02b883451e9180a07.tar.gz frameworks_base-06caf1b1112a6a3e364a46d02b883451e9180a07.tar.bz2 | |
am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev
* commit '31b76b66b1678eb6483676aa2ef587e10b98d02a':
libandroidfw: Do not build device library when building SDK
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/tests/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/androidfw/tests/Android.mk b/libs/androidfw/tests/Android.mk index 1344dd9..b2e465c 100644 --- a/libs/androidfw/tests/Android.mk +++ b/libs/androidfw/tests/Android.mk @@ -51,6 +51,7 @@ include $(BUILD_HOST_NATIVE_TEST) # ========================================================== # Build the device tests: libandroidfw_tests # ========================================================== +ifneq ($(SDK_ONLY),true) include $(CLEAR_VARS) LOCAL_MODULE := libandroidfw_tests @@ -67,3 +68,5 @@ LOCAL_SHARED_LIBRARIES := \ libstlport include $(BUILD_NATIVE_TEST) +endif # Not SDK_ONLY + |