Second beta release

.gitignore

@@ -3,6 +3,7 @@
 *.lo
 *.o
 *.obj
+*.pyc
 
 # Precompiled Headers
 *.gch
@@ -43,6 +44,14 @@ bld/
 ipch/
 .vs/
 
+dist/
+.externalNativeBuild/
+.gradle/
+.classpath
+
+# cross-platform
+platform/cross-platform/out
+platform/cross-platform/vendor
 
 # Windows
 Thumbs.db
@@ -68,5 +77,8 @@ storage.json
 result.epub
 
 *.iml
+.settings/
+.project
+local.properties
 
-platform/android/lcp/libs/
+platform/android/lcp/libs/

README.md

@@ -1,9 +1,10 @@
 readium-lcp-client
 ==================
 
-This repository is for the Readium Lightweight Content Protection (LCP) client side implementation work.
+This repository is for the Readium Licensed Content Protection (LCP) client side implementation work.
 
 Created by Artem Brazhnikov, Mickaël Menu.
+Maintained by Cyrille Lebeaupin, Daniel Weck.
 
 
 ## Overview

platform/android/README.md

@@ -0,0 +1,26 @@
+# Android
+
+## Properties
+
+You can define some properties in local.properties file:
+
+* ndk.dir: Path to the Ndk
+* sdk.dir: Path to the Sdk
+* readium.ndk_skipX86: If true, skip X86 compilation
+* readium.ndk_skipARM: If true, skip ARM compilation
+* readium.ndk_clang: If true, compile with clang
+* readium.sdk_lib_dir: Path to readium sdk lib (*.so files) directory
+* readium.sdk_include_dir: Path to readium include directory
+* readium.extra_cmake: Path to an extra cmake that can modify lib compilation
+
+## Clean
+
+```
+./gradlew clean
+```
+
+## Build
+
+```
+./gradlew build
+```

platform/android/build.gradle

@@ -1,15 +1,46 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-       jcenter()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.6.0-alpha5'
+        Properties properties = new Properties()
+        properties.load(rootProject.file('local.properties').newDataInputStream())
+
+        def ndkClang = properties.getProperty('readium.ndk_clang', "false")
+        ndkClang = (ndkClang == "true") ? true : false;
+        rootProject.ext.set('readium_ndk_clang', ndkClang)
+
+        def ndkSkipX86 = properties.getProperty('readium.ndk_skipX86', "false")
+        ndkSkipX86 = (ndkSkipX86 == "true") ? true : false;
+        rootProject.ext.set('readium_ndk_skipX86', ndkSkipX86)
+
+        def ndkSkipARM = properties.getProperty('readium.ndk_skipARM', "false")
+        ndkSkipARM = (ndkSkipARM == "true") ? true : false;
+        rootProject.ext.set('readium_ndk_skipARM', ndkSkipARM)
+
+        def extraCmake = properties.getProperty('readium.extra_cmake', null)
+        rootProject.ext.set('readium_extra_cmake', extraCmake)
+
+        def readiumSdkLibDir = properties.getProperty('readium.sdk_lib_dir', null)
+        rootProject.ext.set('readium_sdk_lib_dir', readiumSdkLibDir)
+
+        def readiumSdkIncludeDir = properties.getProperty('readium.sdk_include_dir', null)
+        rootProject.ext.set('readium_sdk_include_dir', readiumSdkIncludeDir)
+
+        if (readiumSdkLibDir != null && readiumSdkIncludeDir != null) {
+            rootProject.ext.set('readium_lcp_build_content_filter', true)
+        } else {
+            rootProject.ext.set('readium_lcp_build_content_filter', false)
+        }
+
+        //https://bintray.com/android/android-tools/com.android.tools.build.gradle/view
+        classpath "com.android.tools.build:gradle:2.3.3"
     }
 }
 
 allprojects {
     repositories {
         jcenter()
     }
-}
+}

platform/android/clean.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+rm -rf build
+
+rm -rf lib/build
+rm -rf lib/.externalNativeBuild

platform/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
-#Wed Aug 17 23:29:31 BST 2016
+#Wed Apr 12 13:19:28 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 #https://services.gradle.org/distributions
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+# GRADLE EXPERIMENTAL requires 3.3
+# GRADLE STABLE works with latest (4.4)
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip