commit | 42fbf500f0de56407e2a2fcade9a5e4e869089aa | [log] [tgz] |
---|---|---|
author | The Android Automerger <android-build@google.com> | Tue Feb 02 08:40:15 2016 -0800 |
committer | The Android Automerger <android-build@google.com> | Tue Feb 02 08:40:15 2016 -0800 |
tree | 6877c5fbacda4e9ad40f0d2fe19f8593903d7490 | |
parent | 658d5fee09923c532ec68da3ff7d226a144e5e38 [diff] | |
parent | c7ccb676b8f5665112ae82b53a8889f90c710637 [diff] |
merge in nyc-release history after reset to master
diff --git a/Android.mk b/Android.mk index 9234fe4..5fdc41b 100644 --- a/Android.mk +++ b/Android.mk
@@ -12,6 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +#disable build in PDK +ifneq ($(TARGET_BUILD_PDK),true) + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -132,3 +135,5 @@ include $(BUILD_SHARED_LIBRARY) + +endif #TARGET_BUILD_PDK