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

Revert "Add sdk mutator for native modules"

Browse Source 
Revert submission 1242911-sdk_version_variant

Reason for revert: b/153394225
Reverted Changes:
Ife99745fb:Use libnativewindow for platform variant of libagq...
I1bae84c43:Use libnativewindow for platform variant of androi...
I6e6021ed3:Use stl to depend on libc++
Ife99745fb:Use libnativewindow for platform variant of libRSS...
I2c9f439b9:Fix static dependency on libprotobuf-cpp-lite-ndk
Iff2aff9cf:Set sdk_version for cc_genrules used by modules wi...
I7d72934aa:Add sdk mutator for native modules
Ief378a007:Use sdk variant of Soong modules when LOCAL_SDK_VE...

Bug: 149591340
Change-Id: I798fa902c779469c6382b6699351e5d12bf14785
Fixes: 153394225
This commit is contained in:
Colin Cross
2020-04-07 04:21:21 +00:00
parent 82e192c3ae
commit f8e80229fe
21 changed files with 18 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cc/testing.go
View File

@@ -138,7 +138,6 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
name: "libgcc_stripped",
vendor_available: true,
recovery_available: true,
sdk_version: "current",
src: "",
}
@@ -156,7 +155,6 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
llndk_library {
name: "libc",
symbol_file: "",
sdk_version: "current",
}
cc_library {
name: "libm",
@@ -176,7 +174,6 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
llndk_library {
name: "libm",
symbol_file: "",
sdk_version: "current",
}
cc_library {
name: "libdl",
@@ -196,7 +193,6 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
llndk_library {
name: "libdl",
symbol_file: "",
sdk_version: "current",
}
cc_library {
name: "libft2",
@@ -209,7 +205,6 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
name: "libft2",
symbol_file: "",
vendor_available: false,
sdk_version: "current",
}
cc_library {
name: "libc++_static",
@@ -341,16 +336,6 @@ func GatherRequiredDepsForTest(oses ...android.OsType) string {
sdk_version: "27",
}
ndk_prebuilt_object {
name: "ndk_crtbegin_dynamic.27",
sdk_version: "27",
}
ndk_prebuilt_object {
name: "ndk_crtend_android.27",
sdk_version: "27",
}
ndk_prebuilt_shared_stl {
name: "ndk_libc++_shared",
}