Merge changes from topic "or_return" am: e060580c31 am: d1e6b85f7b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1945135

Change-Id: I25e9c9a9466b60edcab3158104984041b06157ad
This commit is contained in:
Jiyong Park 2022-01-12 08:01:54 +00:00 committed by Automerger Merge Worker
commit 8a038ec1b0

View file

@ -28,18 +28,18 @@ cc_library_headers {
min_sdk_version: "apex_inherit", min_sdk_version: "apex_inherit",
header_libs: [ header_libs: [
"liblog_headers",
"libsystem_headers",
"libcutils_headers",
"libprocessgroup_headers",
"libbase_headers", "libbase_headers",
"libcutils_headers",
"liblog_headers",
"libprocessgroup_headers",
"libsystem_headers",
], ],
export_header_lib_headers: [ export_header_lib_headers: [
"liblog_headers",
"libsystem_headers",
"libcutils_headers",
"libprocessgroup_headers",
"libbase_headers", "libbase_headers",
"libcutils_headers",
"liblog_headers",
"libprocessgroup_headers",
"libsystem_headers",
], ],
export_include_dirs: ["include"], export_include_dirs: ["include"],