From 32e7834f0659d52aa3969cf1d070f9e31f0c3131 Mon Sep 17 00:00:00 2001 From: wyc Date: Tue, 17 Jan 2017 15:59:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E5=90=8D?= =?UTF-8?q?=E4=B8=BAMGLicenseManagerSDK=E5=92=8CAndroid.mk,=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96releaseAll=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MGLicenseManageSDK/settings.gradle | 1 - .../.gitignore | 4 +- .../MGLicenseManagerSDK}/.gitignore | 0 .../MGLicenseManagerSDK}/build.gradle | 36 +++++++++--------- .../MGLicenseManagerSDK}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../licensemanager/sdk/LicenseManager.java | 0 .../sdk/jni/NativeLicenseAPI.java | 0 .../sdk/util/HttpURLClient.java | 0 .../sdk/util/NetWorkHelper.java | 0 .../sdk/util/RequestManager.java | 0 .../src/main/jni/Android.mk | 3 +- .../src/main/jni/Application.mk | 0 .../src/main/jni/include/MG_Common.h | 0 .../src/main/jni/include/MG_LicenseManager.h | 0 .../main/jni/megvii_licensemanager_jni.cpp | 0 .../src/main/jni/megvii_licensemanager_jni.h | 0 .../build.gradle | 0 .../gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradlew | 0 .../gradlew.bat | 0 MGLicenseManagerSDK/settings.gradle | 1 + 24 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 MGLicenseManageSDK/settings.gradle rename {MGLicenseManageSDK => MGLicenseManagerSDK}/.gitignore (94%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/.gitignore (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/build.gradle (73%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/proguard-rules.pro (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/AndroidManifest.xml (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/java/com/megvii/licensemanager/sdk/LicenseManager.java (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/java/com/megvii/licensemanager/sdk/jni/NativeLicenseAPI.java (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/java/com/megvii/licensemanager/sdk/util/HttpURLClient.java (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/java/com/megvii/licensemanager/sdk/util/NetWorkHelper.java (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/java/com/megvii/licensemanager/sdk/util/RequestManager.java (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/jni/Android.mk (91%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/jni/Application.mk (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/jni/include/MG_Common.h (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/jni/include/MG_LicenseManager.h (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/jni/megvii_licensemanager_jni.cpp (100%) rename {MGLicenseManageSDK/MGLicenseManageSDK => MGLicenseManagerSDK/MGLicenseManagerSDK}/src/main/jni/megvii_licensemanager_jni.h (100%) rename {MGLicenseManageSDK => MGLicenseManagerSDK}/build.gradle (100%) rename {MGLicenseManageSDK => MGLicenseManagerSDK}/gradle.properties (100%) rename {MGLicenseManageSDK => MGLicenseManagerSDK}/gradle/wrapper/gradle-wrapper.jar (100%) rename {MGLicenseManageSDK => MGLicenseManagerSDK}/gradle/wrapper/gradle-wrapper.properties (100%) rename {MGLicenseManageSDK => MGLicenseManagerSDK}/gradlew (100%) rename {MGLicenseManageSDK => MGLicenseManagerSDK}/gradlew.bat (100%) create mode 100644 MGLicenseManagerSDK/settings.gradle diff --git a/MGLicenseManageSDK/settings.gradle b/MGLicenseManageSDK/settings.gradle deleted file mode 100644 index bc7e7a3..0000000 --- a/MGLicenseManageSDK/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':MGLicenseManageSDK' diff --git a/MGLicenseManageSDK/.gitignore b/MGLicenseManagerSDK/.gitignore similarity index 94% rename from MGLicenseManageSDK/.gitignore rename to MGLicenseManagerSDK/.gitignore index db14563..e535ad8 100644 --- a/MGLicenseManageSDK/.gitignore +++ b/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/MGLicenseManageSDK/MGLicenseManageSDK/.gitignore b/MGLicenseManagerSDK/MGLicenseManagerSDK/.gitignore similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/.gitignore rename to MGLicenseManagerSDK/MGLicenseManagerSDK/.gitignore diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/build.gradle b/MGLicenseManagerSDK/MGLicenseManagerSDK/build.gradle similarity index 73% rename from MGLicenseManageSDK/MGLicenseManageSDK/build.gradle rename to MGLicenseManagerSDK/MGLicenseManagerSDK/build.gradle index 76c0444..0c590f7 100644 --- a/MGLicenseManageSDK/MGLicenseManageSDK/build.gradle +++ b/MGLicenseManagerSDK/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/MGLicenseManageSDK/MGLicenseManageSDK/proguard-rules.pro b/MGLicenseManagerSDK/MGLicenseManagerSDK/proguard-rules.pro similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/proguard-rules.pro rename to MGLicenseManagerSDK/MGLicenseManagerSDK/proguard-rules.pro diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/AndroidManifest.xml b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/AndroidManifest.xml similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/AndroidManifest.xml rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/AndroidManifest.xml diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/java/com/megvii/licensemanager/sdk/LicenseManager.java b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/java/com/megvii/licensemanager/sdk/LicenseManager.java similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/java/com/megvii/licensemanager/sdk/LicenseManager.java rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/java/com/megvii/licensemanager/sdk/LicenseManager.java diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/java/com/megvii/licensemanager/sdk/jni/NativeLicenseAPI.java b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/java/com/megvii/licensemanager/sdk/jni/NativeLicenseAPI.java similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/java/com/megvii/licensemanager/sdk/jni/NativeLicenseAPI.java rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/java/com/megvii/licensemanager/sdk/jni/NativeLicenseAPI.java diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/java/com/megvii/licensemanager/sdk/util/HttpURLClient.java b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/java/com/megvii/licensemanager/sdk/util/HttpURLClient.java similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/java/com/megvii/licensemanager/sdk/util/HttpURLClient.java rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/java/com/megvii/licensemanager/sdk/util/HttpURLClient.java diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/java/com/megvii/licensemanager/sdk/util/NetWorkHelper.java b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/java/com/megvii/licensemanager/sdk/util/NetWorkHelper.java similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/java/com/megvii/licensemanager/sdk/util/NetWorkHelper.java rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/java/com/megvii/licensemanager/sdk/util/NetWorkHelper.java diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/java/com/megvii/licensemanager/sdk/util/RequestManager.java b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/java/com/megvii/licensemanager/sdk/util/RequestManager.java similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/java/com/megvii/licensemanager/sdk/util/RequestManager.java rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/java/com/megvii/licensemanager/sdk/util/RequestManager.java diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/Android.mk b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/Android.mk similarity index 91% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/Android.mk rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/Android.mk index 2a8fd43..ea914ed 100644 --- a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/Android.mk +++ b/MGLicenseManagerSDK/MGLicenseManagerSDK/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/MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/Application.mk b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/Application.mk similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/Application.mk rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/Application.mk diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/include/MG_Common.h b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/include/MG_Common.h similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/include/MG_Common.h rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/include/MG_Common.h diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/include/MG_LicenseManager.h b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/include/MG_LicenseManager.h similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/include/MG_LicenseManager.h rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/include/MG_LicenseManager.h diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/megvii_licensemanager_jni.cpp b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/megvii_licensemanager_jni.cpp similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/megvii_licensemanager_jni.cpp rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/megvii_licensemanager_jni.cpp diff --git a/MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/megvii_licensemanager_jni.h b/MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/megvii_licensemanager_jni.h similarity index 100% rename from MGLicenseManageSDK/MGLicenseManageSDK/src/main/jni/megvii_licensemanager_jni.h rename to MGLicenseManagerSDK/MGLicenseManagerSDK/src/main/jni/megvii_licensemanager_jni.h diff --git a/MGLicenseManageSDK/build.gradle b/MGLicenseManagerSDK/build.gradle similarity index 100% rename from MGLicenseManageSDK/build.gradle rename to MGLicenseManagerSDK/build.gradle diff --git a/MGLicenseManageSDK/gradle.properties b/MGLicenseManagerSDK/gradle.properties similarity index 100% rename from MGLicenseManageSDK/gradle.properties rename to MGLicenseManagerSDK/gradle.properties diff --git a/MGLicenseManageSDK/gradle/wrapper/gradle-wrapper.jar b/MGLicenseManagerSDK/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from MGLicenseManageSDK/gradle/wrapper/gradle-wrapper.jar rename to MGLicenseManagerSDK/gradle/wrapper/gradle-wrapper.jar diff --git a/MGLicenseManageSDK/gradle/wrapper/gradle-wrapper.properties b/MGLicenseManagerSDK/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from MGLicenseManageSDK/gradle/wrapper/gradle-wrapper.properties rename to MGLicenseManagerSDK/gradle/wrapper/gradle-wrapper.properties diff --git a/MGLicenseManageSDK/gradlew b/MGLicenseManagerSDK/gradlew similarity index 100% rename from MGLicenseManageSDK/gradlew rename to MGLicenseManagerSDK/gradlew diff --git a/MGLicenseManageSDK/gradlew.bat b/MGLicenseManagerSDK/gradlew.bat similarity index 100% rename from MGLicenseManageSDK/gradlew.bat rename to MGLicenseManagerSDK/gradlew.bat diff --git a/MGLicenseManagerSDK/settings.gradle b/MGLicenseManagerSDK/settings.gradle new file mode 100644 index 0000000..65946e9 --- /dev/null +++ b/MGLicenseManagerSDK/settings.gradle @@ -0,0 +1 @@ +include ':MGLicenseManagerSDK'