Merge "Remove ndk_platform backend. Use the ndk backend."

This commit is contained in:
Steven Moreland 2021-08-25 19:28:36 +00:00 committed by Gerrit Code Review
commit 18e980bac2

View file

@ -40,7 +40,7 @@ cc_library {
defaults: ["libpower_defaults"], defaults: ["libpower_defaults"],
srcs: ["power.cpp"], srcs: ["power.cpp"],
export_include_dirs: ["include"], export_include_dirs: ["include"],
shared_libs: ["android.system.suspend-V1-ndk_platform"], shared_libs: ["android.system.suspend-V1-ndk"],
vendor_available: true, vendor_available: true,
vndk: { vndk: {
enabled: true, enabled: true,
@ -54,7 +54,7 @@ cc_test {
static_libs: ["libpower"], static_libs: ["libpower"],
shared_libs: [ shared_libs: [
"android.system.suspend.control.internal-cpp", "android.system.suspend.control.internal-cpp",
"android.system.suspend-V1-ndk_platform", "android.system.suspend-V1-ndk",
], ],
test_suites: ["device-tests"], test_suites: ["device-tests"],
require_root: true, require_root: true,
@ -69,7 +69,7 @@ cc_library_shared {
}, },
shared_libs: [ shared_libs: [
"android.system.suspend-V1-ndk_platform", "android.system.suspend-V1-ndk",
"libdl", "libdl",
], ],
@ -98,7 +98,7 @@ cc_test {
srcs: ["block_suspend.cpp"], srcs: ["block_suspend.cpp"],
static_libs: ["libpower"], static_libs: ["libpower"],
shared_libs: [ shared_libs: [
"android.system.suspend-V1-ndk_platform", "android.system.suspend-V1-ndk",
], ],
gtest: false, gtest: false,
} }