diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-28 18:09:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-28 18:09:20 +0000 |
| commit | d75d3eb5e423fbcc069dd3c40a4a5eeeaf8bcdab (patch) | |
| tree | a783da6843ca37463443f0a0fa0eb7da0823274c /libs | |
| parent | d856afec47c069fe117cdf6c3e22c3d066565a11 (diff) | |
| parent | 06caf1b1112a6a3e364a46d02b883451e9180a07 (diff) | |
| download | frameworks_base-d75d3eb5e423fbcc069dd3c40a4a5eeeaf8bcdab.zip frameworks_base-d75d3eb5e423fbcc069dd3c40a4a5eeeaf8bcdab.tar.gz frameworks_base-d75d3eb5e423fbcc069dd3c40a4a5eeeaf8bcdab.tar.bz2 | |
am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev
automerge: 06caf1b
* commit '06caf1b1112a6a3e364a46d02b883451e9180a07':
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 a421567..a0442e4 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 @@ -66,3 +67,5 @@ LOCAL_SHARED_LIBRARIES := \ libui \ include $(BUILD_NATIVE_TEST) +endif # Not SDK_ONLY + |