Changeset b400a5a in subsurface


Ignore:
Timestamp:
May 27, 2017, 6:54:03 PM (3 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
e255a698
Parents:
01d610b
Message:

Android build: rely on KEYSTORE environment for release build

With the gradle build it seems we automatically get a Debug build unless
the keystore is defined.

Signed-off-by: Dirk Hohndel <dirk@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r91d384d rb400a5a  
    366366        # Android template directory
    367367        include(${QT_ANDROID_CMAKE})
    368         add_qt_android_apk(${SUBSURFACE_TARGET}.apk ${SUBSURFACE_TARGET}
    369                 PACKAGE_SOURCES ${CMAKE_BINARY_DIR}/android-mobile DEPENDS ${ANDROID_NATIVE_LIBSSL} ${ANDROID_NATIVE_LIBCRYPT}
    370                 BUILDTOOLS_REVISION ${BUILDTOOLS_REVISION}
    371         )
     368        if((DEFINED ENV{KEYSTORE}) AND (DEFINED ENV{KEYSTORE_PASSWORD}))
     369                add_qt_android_apk(${SUBSURFACE_TARGET}.apk ${SUBSURFACE_TARGET}
     370                        PACKAGE_SOURCES ${CMAKE_BINARY_DIR}/android-mobile DEPENDS ${ANDROID_NATIVE_LIBSSL} ${ANDROID_NATIVE_LIBCRYPT}
     371                        BUILDTOOLS_REVISION ${BUILDTOOLS_REVISION}
     372                        KEYSTORE $ENV{KEYSTORE} Subsurface-mobile KEYSTORE_PASSWORD $ENV{KEYSTORE_PASSWORD}
     373                )
     374                message(STATUS "KEYSTORE=$ENV{KEYSTORE} KEYSTORE_PASSWORD=$ENV{KEYSTORE_PASSWORD}")
     375        else()
     376                add_qt_android_apk(${SUBSURFACE_TARGET}.apk ${SUBSURFACE_TARGET}
     377                        PACKAGE_SOURCES ${CMAKE_BINARY_DIR}/android-mobile DEPENDS ${ANDROID_NATIVE_LIBSSL} ${ANDROID_NATIVE_LIBCRYPT}
     378                        BUILDTOOLS_REVISION ${BUILDTOOLS_REVISION}
     379                )
     380                message(STATUS "no KEYSTORE")
     381        endif()
    372382elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
    373383        set(APP_BUNDLE_DIR "${SUBSURFACE_TARGET}.app")
Note: See TracChangeset for help on using the changeset viewer.