Skip to content

dev2master #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shifujun merged 6 commits into from
Jun 25, 2019
Merged

dev2master #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
29e52a9
设置宿主LAUNCHER Activity进程为主进程
Jun 19, 2019
e81818b
Merge pull request #2 from guok2046/set_process
shifujun Jun 19, 2019
327b9b8
echo ANDROID_HOME alert more earlier
Jun 21, 2019
f2f82f5
Merge pull request #13 from NoOneNo/my-dev
shifujun Jun 21, 2019
cc9bbe9
fix crash: 索尼G3116，F3116 android 7.0机型兼容性问题。
Jun 25, 2019
114ab13
Merge pull request #18 from xbcbupt725/dev
shifujun Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

if (!System.getenv().containsKey("ANDROID_HOME")) {
throw new RuntimeException("未定义ANDROID_HOME环境变量。" +
"原因：Android Studio目前不支持自动为复合构建中的子构建自动创建local.properties文件。" +
"注意：新增环境变量后，一般不会立即生效，最简单的办法是重启电脑。")
}

//buildscript不能从其他gradle文件中apply，所以这段buildscript脚本存在于多个子构建中。
//请更新buildscript时同步更新。
buildscript {
Expand Down
1 change: 0 additions & 1 deletion projects/sample/sample-host/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
android:theme="@android:style/Theme.DeviceDefault"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.tencent.shadow.sample.host.MainActivity"
android:process=":plugin"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
1 change: 1 addition & 0 deletions ...dk/core/loader/src/main/kotlin/com/tencent/shadow/core/loader/blocs/CreateResourceBloc.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ object CreateResourceBloc {
fun create(packageArchiveInfo: PackageInfo, archiveFilePath: String, hostAppContext: Context): Resources {
val packageManager = hostAppContext.packageManager
packageArchiveInfo.applicationInfo.publicSourceDir = archiveFilePath
packageArchiveInfo.applicationInfo.sourceDir = archiveFilePath
try {
return packageManager.getResourcesForApplication(packageArchiveInfo.applicationInfo)
} catch (e: PackageManager.NameNotFoundException) {
Expand Down
1 change: 1 addition & 0 deletions ...c/dynamic-host/src/main/java/com/tencent/shadow/dynamic/host/ChangeApkContextWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ private Resources createResources(String apkPath, Context base) {
PackageManager packageManager = base.getPackageManager();
PackageInfo packageArchiveInfo = packageManager.getPackageArchiveInfo(apkPath, GET_META_DATA);
packageArchiveInfo.applicationInfo.publicSourceDir = apkPath;
packageArchiveInfo.applicationInfo.sourceDir = apkPath;
try {
return packageManager.getResourcesForApplication(packageArchiveInfo.applicationInfo);
} catch (PackageManager.NameNotFoundException e) {
Expand Down
6 changes: 6 additions & 0 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
rootProject.name = 'shadow'

if (!System.getenv().containsKey("ANDROID_HOME")) {
throw new RuntimeException("未定义ANDROID_HOME环境变量。" +
"原因：Android Studio目前不支持自动为复合构建中的子构建自动创建local.properties文件。" +
"注意：新增环境变量后，一般不会立即生效，最简单的办法是重启电脑。")
}

includeBuild 'projects/sdk/coding'
includeBuild 'projects/sdk/core'
includeBuild 'projects/sdk/dynamic'
Expand Down