From 3a45281872bac1f0b5ef539e509ed17977b5a2de Mon Sep 17 00:00:00 2001
From: Pepijn Noltes <pepijnnoltes@gmail.com>
Date: Fri, 5 Feb 2016 14:52:26 +0100
Subject: [PATCH] CELIX-335: Disable config_admin, issue for osx. Disable
 Android.

Android currently does not build because CMake 2.8 is used. A upgrade in the DockerFile is needed.
---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7448d7230..c0d207542 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,9 +31,9 @@ matrix:
        - os: linux
          compiler: gcc
          env: SANITIZE=1
-       - os: linux
-         compiler: clang
-         env: ANDROID=1
+#       - os: linux
+#         compiler: clang
+#         env: ANDROID=1
 
 
 before_install:
@@ -53,7 +53,7 @@ before_script:
     - cd -
     - mkdir build install
     - export BUILD_OPTIONS=" \
-        -DBUILD_CONFIG_ADMIN=ON \
+        -DBUILD_CONFIG_ADMIN=OFF \
         -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON \
         -DBUILD_DEPLOYMENT_ADMIN=ON \
         -DBUILD_DEPENDENCY_MANAGER=ON \