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.
apache · Feb 5, 2016 · 3a45281 · 3a45281
1 parent 2e31fdd
commit 3a45281
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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 \