StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the incorrect merge conflict resolution

Browse Source 
This change fixes the incorrect merge conflict resolution of
3b17896950

Bug: N/A
Test: m
Change-Id: If00db9ab9758384a2def5442fbeecb36615d2ec1
This commit is contained in:
Jiyong Park
2020-02-06 16:47:54 +09:00
parent 085ac78cdf
commit 26fb6bdba1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/apex.go
View File

@@ -743,14 +743,12 @@ func makeApexAvailableWhitelist() map[string][]string {
"kotlinx-coroutines-core-nodeps", "kotlinx-coroutines-core-nodeps",
"libprotobuf-java-lite", "libprotobuf-java-lite",
"permissioncontroller-statsd", "permissioncontroller-statsd",
"GooglePermissionController",
"PermissionController",
} }
// //
// Module separator // Module separator
// //
m["com.android.permission"] = []string{"GooglePermissionController", "PermissionController"}
//
// Module separator
//
m["com.android.runtime"] = []string{ m["com.android.runtime"] = []string{
"bionic_libc_platform_headers", "bionic_libc_platform_headers",
"fmtlib", "fmtlib",