diff options
| author | Zhengyin Qian <qianzy@google.com> | 2015-08-19 15:31:06 -0700 |
|---|---|---|
| committer | Zhengyin Qian <qianzy@google.com> | 2015-08-19 15:31:06 -0700 |
| commit | 771d851381eebcf3a47a368b6a307aa5d4121ea8 (patch) | |
| tree | 1eeae3888d61720a9d7869d3f9d5ad4ef04c89c7 /utility | |
| parent | 7f346c9058f39a533a2eaadc9ebc4001397c6ff9 (diff) | |
| parent | 531c26be6445110360042f1c94952fbcb76d4971 (diff) | |
| download | platform_external_parameter-framework-marshmallow-dr1.6-release.tar.gz platform_external_parameter-framework-marshmallow-dr1.6-release.tar.bz2 platform_external_parameter-framework-marshmallow-dr1.6-release.zip | |
resolved conflicts for merge of 531c26be to cw-e-devandroid-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-dev
Change-Id: I02a7a956d2423f86bc790473687b80bb3132f6dc
Diffstat (limited to 'utility')
| -rw-r--r-- | utility/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/utility/Android.mk b/utility/Android.mk index 168c423..acafaef 100644 --- a/utility/Android.mk +++ b/utility/Android.mk @@ -61,6 +61,10 @@ LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_CFLAGS := $(common_cflags) +ifeq ($(INCLUDE_STLPORT), true) +include external/stlport/libstlport.mk +endif + include $(BUILD_STATIC_LIBRARY) ############################## |