| commit | 78229d88678932244f7cbb6e52ad43c0d986a780 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Thu Feb 25 23:11:20 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 25 23:11:20 2016 +0000 |
| tree | fcf5b5faa56d827b54c5e5f8c3f47f01295e4694 | |
| parent | f013dc41d9ac1e295c91594e6f2ebc1455af5f41 [diff] | |
| parent | a2b6c4b54cd3ae3db7f2a7f1df6d6f889af1e743 [diff] |
Merge "audio policy: engine configurable: allow to use custom PFW and plugins" into nyc-dev
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk index c65de92..8221496 100755 --- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk +++ b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk
@@ -1,5 +1,7 @@ LOCAL_PATH := $(call my-dir) +ifneq ($(USE_CUSTOM_PARAMETER_FRAMEWORK), true) + include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional @@ -33,3 +35,4 @@ include $(BUILD_SHARED_LIBRARY) +endif # ifneq ($(USE_CUSTOM_PARAMETER_FRAMEWORK), true)