You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/03/30 11:38:40 UTC
[06/30] incubator-weex git commit: * [android] let embedders have a
chance to take charge of library * loading.
* [android] let embedders have a chance to take charge of library
* loading.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ab76ce72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ab76ce72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ab76ce72
Branch: refs/heads/0.12-dev
Commit: ab76ce72bdc679f8041a1c1c6eade57b1fd707fd
Parents: d10f1ab
Author: butuo.dbt <bu...@alibaba-inc.com>
Authored: Fri Mar 3 11:08:16 2017 +0800
Committer: bruno.duan <br...@gmail.com>
Committed: Tue Mar 7 15:27:49 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/InitConfig.java | 14 ++
.../main/java/com/taobao/weex/WXSDKEngine.java | 3 +-
.../main/java/com/taobao/weex/WXSDKManager.java | 7 +
.../taobao/weex/adapter/IWXSoLoaderAdapter.java | 236 +++++++++++++++++++
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 41 +++-
5 files changed, 291 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ab76ce72/android/sdk/src/main/java/com/taobao/weex/InitConfig.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/InitConfig.java b/android/sdk/src/main/java/com/taobao/weex/InitConfig.java
index c9b2857..af76b77 100644
--- a/android/sdk/src/main/java/com/taobao/weex/InitConfig.java
+++ b/android/sdk/src/main/java/com/taobao/weex/InitConfig.java
@@ -209,6 +209,7 @@ import com.taobao.weex.adapter.IWXDebugAdapter;
import com.taobao.weex.adapter.IWXHttpAdapter;
import com.taobao.weex.adapter.IWXImgLoaderAdapter;
import com.taobao.weex.adapter.IWXJSExceptionAdapter;
+import com.taobao.weex.adapter.IWXSoLoaderAdapter;
import com.taobao.weex.adapter.IWXUserTrackAdapter;
import com.taobao.weex.adapter.URIAdapter;
import com.taobao.weex.appfram.storage.IWXStorageAdapter;
@@ -224,6 +225,7 @@ public class InitConfig {
private IWXUserTrackAdapter utAdapter;
private IWXDebugAdapter debugAdapter;
private IWXStorageAdapter storageAdapter;
+ private IWXSoLoaderAdapter soLoader;
private URIAdapter mURIAdapter;
private IWebSocketAdapterFactory webSocketAdapterFactory;
private IWXJSExceptionAdapter mJSExceptionAdapter;
@@ -248,6 +250,11 @@ public class InitConfig {
public IWXDebugAdapter getDebugAdapter(){
return debugAdapter;
}
+
+ public IWXSoLoaderAdapter getIWXSoLoaderAdapter() {
+ return soLoader;
+ }
+
public String getFramework() {
return framework;
}
@@ -278,6 +285,7 @@ public class InitConfig {
IWXUserTrackAdapter utAdapter;
IWXDebugAdapter debugAdapter;
IWXStorageAdapter storageAdapter;
+ IWXSoLoaderAdapter soLoader;
URIAdapter mURIAdapter;
IWXJSExceptionAdapter mJSExceptionAdapter;
String framework;
@@ -326,6 +334,11 @@ public class InitConfig {
return this;
}
+ public Builder setSoLoader(IWXSoLoaderAdapter loader) {
+ this.soLoader = loader;
+ return this;
+ }
+
public Builder setFramework(String framework){
this.framework=framework;
return this;
@@ -344,6 +357,7 @@ public class InitConfig {
config.utAdapter = this.utAdapter;
config.debugAdapter=this.debugAdapter;
config.storageAdapter = this.storageAdapter;
+ config.soLoader=this.soLoader;
config.framework=this.framework;
config.mURIAdapter = this.mURIAdapter;
config.webSocketAdapterFactory = this.webSocketAdapterFactory;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ab76ce72/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
index f7bbee7..526c989 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
@@ -120,6 +120,7 @@ import android.util.Log;
import com.taobao.weex.adapter.IDrawableLoader;
import com.taobao.weex.adapter.IWXHttpAdapter;
import com.taobao.weex.adapter.IWXImgLoaderAdapter;
+import com.taobao.weex.adapter.IWXSoLoaderAdapter;
import com.taobao.weex.adapter.IWXJSExceptionAdapter;
import com.taobao.weex.adapter.IWXUserTrackAdapter;
import com.taobao.weex.appfram.clipboard.WXClipboardModule;
@@ -268,7 +269,7 @@ public class WXSDKEngine {
config.getDebugAdapter().initDebug(application);
}
}
- WXSoInstallMgrSdk.init(application);
+ WXSoInstallMgrSdk.init(application, sm.getIWXSoLoaderAdapter());
boolean isSoInitSuccess = WXSoInstallMgrSdk.initSo(V8_SO_NAME, 1, config!=null?config.getUtAdapter():null);
if (!isSoInitSuccess) {
return;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ab76ce72/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
index bcf306b..821ab30 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
@@ -139,6 +139,7 @@ import com.taobao.weex.adapter.IWXDebugAdapter;
import com.taobao.weex.adapter.IWXHttpAdapter;
import com.taobao.weex.adapter.IWXImgLoaderAdapter;
import com.taobao.weex.adapter.IWXJSExceptionAdapter;
+import com.taobao.weex.adapter.IWXSoLoaderAdapter;
import com.taobao.weex.adapter.IWXUserTrackAdapter;
import com.taobao.weex.adapter.URIAdapter;
import com.taobao.weex.appfram.navigator.IActivityNavBarSetter;
@@ -177,6 +178,7 @@ public class WXSDKManager {
private IWXUserTrackAdapter mIWXUserTrackAdapter;
private IWXImgLoaderAdapter mIWXImgLoaderAdapter;
+ private IWXSoLoaderAdapter mIWXSoLoaderAdapter;
private IDrawableLoader mDrawableLoader;
private IWXHttpAdapter mIWXHttpAdapter;
private IWXDebugAdapter mIWXDebugAdapter;
@@ -394,6 +396,10 @@ public class WXSDKManager {
return mURIAdapter;
}
+ public IWXSoLoaderAdapter getIWXSoLoaderAdapter() {
+ return mIWXSoLoaderAdapter;
+ }
+
void setInitConfig(InitConfig config){
this.mIWXDebugAdapter = config.getDebugAdapter();
this.mIWXHttpAdapter = config.getHttpAdapter();
@@ -404,6 +410,7 @@ public class WXSDKManager {
this.mURIAdapter = config.getURIAdapter();
this.mIWebSocketAdapterFactory = config.getWebSocketAdapterFactory();
this.mIWXJSExceptionAdapter = config.getJSExceptionAdapter();
+ this.mIWXSoLoaderAdapter = config.getIWXSoLoaderAdapter();
}
public IWXDebugAdapter getIWXDebugAdapter() {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ab76ce72/android/sdk/src/main/java/com/taobao/weex/adapter/IWXSoLoaderAdapter.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXSoLoaderAdapter.java b/android/sdk/src/main/java/com/taobao/weex/adapter/IWXSoLoaderAdapter.java
new file mode 100755
index 0000000..4379dab
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/adapter/IWXSoLoaderAdapter.java
@@ -0,0 +1,236 @@
+/**
+ *
+ * Apache License
+ * Version 2.0, January 2004
+ * http://www.apache.org/licenses/
+ *
+ * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ * 1. Definitions.
+ *
+ * "License" shall mean the terms and conditions for use, reproduction,
+ * and distribution as defined by Sections 1 through 9 of this document.
+ *
+ * "Licensor" shall mean the copyright owner or entity authorized by
+ * the copyright owner that is granting the License.
+ *
+ * "Legal Entity" shall mean the union of the acting entity and all
+ * other entities that control, are controlled by, or are under common
+ * control with that entity. For the purposes of this definition,
+ * "control" means (i) the power, direct or indirect, to cause the
+ * direction or management of such entity, whether by contract or
+ * otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ * outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ * "You" (or "Your") shall mean an individual or Legal Entity
+ * exercising permissions granted by this License.
+ *
+ * "Source" form shall mean the preferred form for making modifications,
+ * including but not limited to software source code, documentation
+ * source, and configuration files.
+ *
+ * "Object" form shall mean any form resulting from mechanical
+ * transformation or translation of a Source form, including but
+ * not limited to compiled object code, generated documentation,
+ * and conversions to other media types.
+ *
+ * "Work" shall mean the work of authorship, whether in Source or
+ * Object form, made available under the License, as indicated by a
+ * copyright notice that is included in or attached to the work
+ * (an example is provided in the Appendix below).
+ *
+ * "Derivative Works" shall mean any work, whether in Source or Object
+ * form, that is based on (or derived from) the Work and for which the
+ * editorial revisions, annotations, elaborations, or other modifications
+ * represent, as a whole, an original work of authorship. For the purposes
+ * of this License, Derivative Works shall not include works that remain
+ * separable from, or merely link (or bind by name) to the interfaces of,
+ * the Work and Derivative Works thereof.
+ *
+ * "Contribution" shall mean any work of authorship, including
+ * the original version of the Work and any modifications or additions
+ * to that Work or Derivative Works thereof, that is intentionally
+ * submitted to Licensor for inclusion in the Work by the copyright owner
+ * or by an individual or Legal Entity authorized to submit on behalf of
+ * the copyright owner. For the purposes of this definition, "submitted"
+ * means any form of electronic, verbal, or written communication sent
+ * to the Licensor or its representatives, including but not limited to
+ * communication on electronic mailing lists, source code control systems,
+ * and issue tracking systems that are managed by, or on behalf of, the
+ * Licensor for the purpose of discussing and improving the Work, but
+ * excluding communication that is conspicuously marked or otherwise
+ * designated in writing by the copyright owner as "Not a Contribution."
+ *
+ * "Contributor" shall mean Licensor and any individual or Legal Entity
+ * on behalf of whom a Contribution has been received by Licensor and
+ * subsequently incorporated within the Work.
+ *
+ * 2. Grant of Copyright License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * copyright license to reproduce, prepare Derivative Works of,
+ * publicly display, publicly perform, sublicense, and distribute the
+ * Work and such Derivative Works in Source or Object form.
+ *
+ * 3. Grant of Patent License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * (except as stated in this section) patent license to make, have made,
+ * use, offer to sell, sell, import, and otherwise transfer the Work,
+ * where such license applies only to those patent claims licensable
+ * by such Contributor that are necessarily infringed by their
+ * Contribution(s) alone or by combination of their Contribution(s)
+ * with the Work to which such Contribution(s) was submitted. If You
+ * institute patent litigation against any entity (including a
+ * cross-claim or counterclaim in a lawsuit) alleging that the Work
+ * or a Contribution incorporated within the Work constitutes direct
+ * or contributory patent infringement, then any patent licenses
+ * granted to You under this License for that Work shall terminate
+ * as of the date such litigation is filed.
+ *
+ * 4. Redistribution. You may reproduce and distribute copies of the
+ * Work or Derivative Works thereof in any medium, with or without
+ * modifications, and in Source or Object form, provided that You
+ * meet the following conditions:
+ *
+ * (a) You must give any other recipients of the Work or
+ * Derivative Works a copy of this License; and
+ *
+ * (b) You must cause any modified files to carry prominent notices
+ * stating that You changed the files; and
+ *
+ * (c) You must retain, in the Source form of any Derivative Works
+ * that You distribute, all copyright, patent, trademark, and
+ * attribution notices from the Source form of the Work,
+ * excluding those notices that do not pertain to any part of
+ * the Derivative Works; and
+ *
+ * (d) If the Work includes a "NOTICE" text file as part of its
+ * distribution, then any Derivative Works that You distribute must
+ * include a readable copy of the attribution notices contained
+ * within such NOTICE file, excluding those notices that do not
+ * pertain to any part of the Derivative Works, in at least one
+ * of the following places: within a NOTICE text file distributed
+ * as part of the Derivative Works; within the Source form or
+ * documentation, if provided along with the Derivative Works; or,
+ * within a display generated by the Derivative Works, if and
+ * wherever such third-party notices normally appear. The contents
+ * of the NOTICE file are for informational purposes only and
+ * do not modify the License. You may add Your own attribution
+ * notices within Derivative Works that You distribute, alongside
+ * or as an addendum to the NOTICE text from the Work, provided
+ * that such additional attribution notices cannot be construed
+ * as modifying the License.
+ *
+ * You may add Your own copyright statement to Your modifications and
+ * may provide additional or different license terms and conditions
+ * for use, reproduction, or distribution of Your modifications, or
+ * for any such Derivative Works as a whole, provided Your use,
+ * reproduction, and distribution of the Work otherwise complies with
+ * the conditions stated in this License.
+ *
+ * 5. Submission of Contributions. Unless You explicitly state otherwise,
+ * any Contribution intentionally submitted for inclusion in the Work
+ * by You to the Licensor shall be under the terms and conditions of
+ * this License, without any additional terms or conditions.
+ * Notwithstanding the above, nothing herein shall supersede or modify
+ * the terms of any separate license agreement you may have executed
+ * with Licensor regarding such Contributions.
+ *
+ * 6. Trademarks. This License does not grant permission to use the trade
+ * names, trademarks, service marks, or product names of the Licensor,
+ * except as required for reasonable and customary use in describing the
+ * origin of the Work and reproducing the content of the NOTICE file.
+ *
+ * 7. Disclaimer of Warranty. Unless required by applicable law or
+ * agreed to in writing, Licensor provides the Work (and each
+ * Contributor provides its Contributions) on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied, including, without limitation, any warranties or conditions
+ * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ * PARTICULAR PURPOSE. You are solely responsible for determining the
+ * appropriateness of using or redistributing the Work and assume any
+ * risks associated with Your exercise of permissions under this License.
+ *
+ * 8. Limitation of Liability. In no event and under no legal theory,
+ * whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law (such as deliberate and grossly
+ * negligent acts) or agreed to in writing, shall any Contributor be
+ * liable to You for damages, including any direct, indirect, special,
+ * incidental, or consequential damages of any character arising as a
+ * result of this License or out of the use or inability to use the
+ * Work (including but not limited to damages for loss of goodwill,
+ * work stoppage, computer failure or malfunction, or any and all
+ * other commercial damages or losses), even if such Contributor
+ * has been advised of the possibility of such damages.
+ *
+ * 9. Accepting Warranty or Additional Liability. While redistributing
+ * the Work or Derivative Works thereof, You may choose to offer,
+ * and charge a fee for, acceptance of support, warranty, indemnity,
+ * or other liability obligations and/or rights consistent with this
+ * License. However, in accepting such obligations, You may act only
+ * on Your own behalf and on Your sole responsibility, not on behalf
+ * of any other Contributor, and only if You agree to indemnify,
+ * defend, and hold each Contributor harmless for any liability
+ * incurred by, or claims asserted against, such Contributor by reason
+ * of your accepting any such warranty or additional liability.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * APPENDIX: How to apply the Apache License to your work.
+ *
+ * To apply the Apache License to your work, attach the following
+ * boilerplate notice, with the fields enclosed by brackets "[]"
+ * replaced with your own identifying information. (Don't include
+ * the brackets!) The text should be enclosed in the appropriate
+ * comment syntax for the file format. We also recommend that a
+ * file or class name and description of purpose be included on the
+ * same "printed page" as the copyright notice for easier
+ * identification within third-party archives.
+ *
+ * Copyright 2016 Alibaba Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.taobao.weex.adapter;
+
+/**
+ * Interface for loading library.
+ */
+public interface IWXSoLoaderAdapter {
+ /**
+ * A method <code>doLoadLibrary</code> that
+ * helps embedders to load a shared library with a short name.
+ * <p>
+ *
+ * Embedders would have a chance to take charge of library loading,
+ * they could load libraries with different class loaders,
+ * or load libraries from specified library pathes.
+ *
+ * @param shortName the name of the library
+ */
+ void doLoadLibrary(String shortName);
+
+ /**
+ * A method <code>doLoad</code> that
+ * helps embedders to load a shared library.
+ * <p>
+ *
+ * Embedders would have a chance to take charge of library loading,
+ * they could load libraries with different class loaders,
+ * or load libraries from specified library pathes.
+ *
+ * @param name the file to load.
+ */
+ void doLoad(String name);
+}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ab76ce72/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
index 9a8583a..f1a43d1 100755
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
@@ -209,6 +209,7 @@ import android.content.pm.ApplicationInfo;
import android.os.Build;
import com.taobao.weex.WXEnvironment;
+import com.taobao.weex.adapter.IWXSoLoaderAdapter;
import com.taobao.weex.adapter.IWXUserTrackAdapter;
import com.taobao.weex.common.WXErrorCode;
import com.taobao.weex.common.WXPerformance;
@@ -255,9 +256,11 @@ public class WXSoInstallMgrSdk {
private final static int X86_Size = 4451068;
static Context mContext = null;
+ private static IWXSoLoaderAdapter mSoLoader = null;
- public static void init(Context c) {
+ public static void init(Context c, IWXSoLoaderAdapter loader) {
mContext = c;
+ mSoLoader = loader;
}
public static boolean isX86(){
@@ -272,8 +275,11 @@ public class WXSoInstallMgrSdk {
/**
* Load so library.
- * First, it will try use {@link System#loadLibrary(String)} to load library.
- * If it fails, then it will try to extract the so library and load it from arembi in the .apk
+ *
+ * If a library loader adapter exists, use this adapter to load library,
+ * otherwise use {@link System#loadLibrary(String)} to load library.
+ * If failed to load library, try to extract the so library and load it
+ * from arembi in the .apk
*
* @param libName library name, like webp, not necessary to be libwep.so
* @param version the version of the so library
@@ -290,7 +296,13 @@ public class WXSoInstallMgrSdk {
* Load library with {@link System#loadLibrary(String)}
*/
try {
- System.loadLibrary(libName);
+ // If a library loader adapter exists, use this adapter to load library
+ // instead of System.loadLibrary.
+ if (mSoLoader != null) {
+ mSoLoader.doLoadLibrary(libName);
+ } else {
+ System.loadLibrary(libName);
+ }
commit(utAdapter, null, null);
InitSuc = true;
@@ -438,24 +450,35 @@ public class WXSoInstallMgrSdk {
/**
* Load .so library
*/
- static boolean _loadUnzipSo(String libName, int version, IWXUserTrackAdapter utAdapter) {
+ static boolean _loadUnzipSo(String libName,
+ int version,
+ IWXUserTrackAdapter utAdapter) {
boolean initSuc = false;
try {
if (isExist(libName, version)) {
- System.load(_targetSoFile(libName, version));
+ // If a library loader adapter exists, use this adapter to load library
+ // instead of System.load.
+ if (mSoLoader != null) {
+ mSoLoader.doLoad(_targetSoFile(libName, version));
+ } else {
+ System.load(_targetSoFile(libName, version));
+ }
commit(utAdapter, "2000", "Load file extract from apk successfully.");
}
initSuc = true;
} catch (Throwable e) {
- commit(utAdapter, WXErrorCode.WX_ERR_COPY_FROM_APK.getErrorCode(), WXErrorCode.WX_ERR_COPY_FROM_APK.getErrorMsg() + ":" + e.getMessage());
+ commit(utAdapter,
+ WXErrorCode.WX_ERR_COPY_FROM_APK.getErrorCode(),
+ WXErrorCode.WX_ERR_COPY_FROM_APK.getErrorMsg() + ":" + e.getMessage());
initSuc = false;
WXLogUtils.e("", e);
}
return initSuc;
}
- static boolean unZipSelectedFiles(String libName, int version, IWXUserTrackAdapter utAdapter) throws ZipException, IOException {
-
+ static boolean unZipSelectedFiles(String libName,
+ int version,
+ IWXUserTrackAdapter utAdapter) throws ZipException, IOException {
String sourcePath = "lib/armeabi/lib" + libName + ".so";
String zipPath = "";