Merge pull request #2 from FacePlusPlus/dev

rename to MGLicenseManagerSDK, fix releaseAll task and strip jni libs
FacePlusPlus · Jan 17, 2017 · 0a0f878 · 0a0f878
2 parents e8bd71a + 32e7834
commit 0a0f878
Show file tree

Hide file tree

Showing 24 changed files with 23 additions and 22 deletions.
diff --git a/MGLicenseManageSDK/settings.gradle b/MGLicenseManageSDK/settings.gradle
diff --git a/MGLicenseManageSDK/.gitignore → MGLicenseManagerSDK/.gitignore b/MGLicenseManageSDK/.gitignore → MGLicenseManagerSDK/.gitignore
@@ -11,8 +11,8 @@ local.properties
 .gradle/
 obj/
 .externalNativeBuild
-MGLicenseManageSDK/src/main/jni/libs/
-MGLicenseManageSDK/src/main/jni/megviifacepp_*_model
+MGLicenseManagerSDK/src/main/jni/libs/
+MGLicenseManagerSDK/src/main/jni/megviifacepp_*_model
 release/
 build/
 .idea

diff --git a/...seManageSDK/MGLicenseManageSDK/.gitignore → ...ManagerSDK/MGLicenseManagerSDK/.gitignore b/...seManageSDK/MGLicenseManageSDK/.gitignore → ...ManagerSDK/MGLicenseManagerSDK/.gitignore
diff --git a/...ManageSDK/MGLicenseManageSDK/build.gradle → ...nagerSDK/MGLicenseManagerSDK/build.gradle b/...ManageSDK/MGLicenseManageSDK/build.gradle → ...nagerSDK/MGLicenseManagerSDK/build.gradle
@@ -14,7 +14,7 @@ android {
             // libraries Gradle should build and package with your APK.
             abiFilters 'arm64-v8a', 'armeabi-v7a'
         }
-        project.archivesBaseName = "MGLicenceManageSDK"
+        project.archivesBaseName = "MGLicenseManagerSDK"
         project.version = android.defaultConfig.versionName
     }
     buildTypes {
@@ -47,22 +47,24 @@ android {
 }
 
 task releaseAll() {
-    delete '../release'
-    copy {
-        from "build/intermediates/bundles/release/"
-        into "../release/for-eclipse/libs"
-        include "classes.jar"
-        rename ("classes.jar", "${archivesBaseName}-${version}.jar")
-    }
-    copy {
-        from "build/outputs/aar/${archivesBaseName}-${version}.aar"
-        //include "*"
-        into "../release"
-    }
-    copy {
-        from "build/intermediates/ndkBuild/release/obj/local/"
-        exclude "*/objs"
-        into "../release/for-eclipse/libs"
+    doLast {
+        delete '../release'
+        copy {
+            from "build/intermediates/bundles/release/"
+            into "../release/for-eclipse/libs"
+            include "classes.jar"
+            rename("classes.jar", "${archivesBaseName}-${version}.jar")
+        }
+        copy {
+            from "build/outputs/aar/${archivesBaseName}-${version}.aar"
+            //include "*"
+            into "../release"
+        }
+        copy {
+            from "build/intermediates/ndkBuild/release/obj/local/"
+            exclude "*/objs"
+            into "../release/for-eclipse/libs"
+        }
     }
     dependsOn build
 }

diff --git a/...SDK/MGLicenseManageSDK/proguard-rules.pro → ...DK/MGLicenseManagerSDK/proguard-rules.pro b/...SDK/MGLicenseManageSDK/proguard-rules.pro → ...DK/MGLicenseManagerSDK/proguard-rules.pro
diff --git a/...nseManageSDK/src/main/AndroidManifest.xml → ...seManagerSDK/src/main/AndroidManifest.xml b/...nseManageSDK/src/main/AndroidManifest.xml → ...seManagerSDK/src/main/AndroidManifest.xml
diff --git a/...ii/licensemanager/sdk/LicenseManager.java → ...ii/licensemanager/sdk/LicenseManager.java b/...ii/licensemanager/sdk/LicenseManager.java → ...ii/licensemanager/sdk/LicenseManager.java
diff --git a/...ensemanager/sdk/jni/NativeLicenseAPI.java → ...ensemanager/sdk/jni/NativeLicenseAPI.java b/...ensemanager/sdk/jni/NativeLicenseAPI.java → ...ensemanager/sdk/jni/NativeLicenseAPI.java
diff --git a/...icensemanager/sdk/util/HttpURLClient.java → ...icensemanager/sdk/util/HttpURLClient.java b/...icensemanager/sdk/util/HttpURLClient.java → ...icensemanager/sdk/util/HttpURLClient.java
diff --git a/...icensemanager/sdk/util/NetWorkHelper.java → ...icensemanager/sdk/util/NetWorkHelper.java b/...icensemanager/sdk/util/NetWorkHelper.java → ...icensemanager/sdk/util/NetWorkHelper.java
diff --git a/...censemanager/sdk/util/RequestManager.java → ...censemanager/sdk/util/RequestManager.java b/...censemanager/sdk/util/RequestManager.java → ...censemanager/sdk/util/RequestManager.java
diff --git a/...GLicenseManageSDK/src/main/jni/Android.mk → ...LicenseManagerSDK/src/main/jni/Android.mk b/...GLicenseManageSDK/src/main/jni/Android.mk → ...LicenseManagerSDK/src/main/jni/Android.mk
@@ -11,9 +11,8 @@ LOCAL_MODULE    := MegviiLicenseManager-jni-0.2.0
 LOCAL_SRC_FILES := megvii_licensemanager_jni.cpp
 LOCAL_C_INCLUDES := include
 LOCAL_C_INCLUDES += thirdparty security
-LOCAL_STATIC_LIBRARIES := cpufeatures 
 LOCAL_SHARED_LIBRARIES := OnlinAuth
-LOCAL_LDLIBS += -L$(SYSROOT)/usr/lib -llog
+LOCAL_LDLIBS += -L$(SYSROOT)/usr/lib -llog -Wl,-s
 LOCAL_CPPFLAGS += -std=c++11 -ffunction-sections -fdata-sections -fvisibility=hidden \
 		-Wall -Wextra -fweb 
 LOCAL_LDFLAGS += -Wl,--gc-sections

diff --git a/...enseManageSDK/src/main/jni/Application.mk → ...nseManagerSDK/src/main/jni/Application.mk b/...enseManageSDK/src/main/jni/Application.mk → ...nseManagerSDK/src/main/jni/Application.mk
diff --git a/...anageSDK/src/main/jni/include/MG_Common.h → ...nagerSDK/src/main/jni/include/MG_Common.h b/...anageSDK/src/main/jni/include/MG_Common.h → ...nagerSDK/src/main/jni/include/MG_Common.h
diff --git a/.../src/main/jni/include/MG_LicenseManager.h → .../src/main/jni/include/MG_LicenseManager.h b/.../src/main/jni/include/MG_LicenseManager.h → .../src/main/jni/include/MG_LicenseManager.h
diff --git a/...rc/main/jni/megvii_licensemanager_jni.cpp → ...rc/main/jni/megvii_licensemanager_jni.cpp b/...rc/main/jni/megvii_licensemanager_jni.cpp → ...rc/main/jni/megvii_licensemanager_jni.cpp
diff --git a/.../src/main/jni/megvii_licensemanager_jni.h → .../src/main/jni/megvii_licensemanager_jni.h b/.../src/main/jni/megvii_licensemanager_jni.h → .../src/main/jni/megvii_licensemanager_jni.h
diff --git a/MGLicenseManageSDK/build.gradle → MGLicenseManagerSDK/build.gradle b/MGLicenseManageSDK/build.gradle → MGLicenseManagerSDK/build.gradle
diff --git a/MGLicenseManageSDK/gradle.properties → MGLicenseManagerSDK/gradle.properties b/MGLicenseManageSDK/gradle.properties → MGLicenseManagerSDK/gradle.properties
diff --git a/...nageSDK/gradle/wrapper/gradle-wrapper.jar → ...agerSDK/gradle/wrapper/gradle-wrapper.jar b/...nageSDK/gradle/wrapper/gradle-wrapper.jar → ...agerSDK/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/MGLicenseManageSDK/gradlew → MGLicenseManagerSDK/gradlew b/MGLicenseManageSDK/gradlew → MGLicenseManagerSDK/gradlew
diff --git a/MGLicenseManageSDK/gradlew.bat → MGLicenseManagerSDK/gradlew.bat b/MGLicenseManageSDK/gradlew.bat → MGLicenseManagerSDK/gradlew.bat
diff --git a/MGLicenseManagerSDK/settings.gradle b/MGLicenseManagerSDK/settings.gradle
@@ -0,0 +1 @@
+include ':MGLicenseManagerSDK'