0f53d1794a
Also remove statically linking libc++, because these libraries are not
exported native shared libraries.
We are slightly over the 12MB limit for ramdisk recovery size, so let's
remove the adb pairing libraries, since they won't be used in recovery
mode.
These are only used in normal boot mode, and currently, only by adb
client. The pairing server is used by system server.
Bug: 150317254
Test: Check size of ramdisk-recovery.img in walleye, walleye-hwasam
build to be under 12MB. Also verify installed-files-recovery.txt no
longer contains libadb_pairing*.
Also put phone into recovery mode, check system/lib64 for no
libadb_pairing*.
Change-Id: Ida7c4fdc9dda2b09091b853feac8df8f125e4274
Merged-In: Ida7c4fdc9dda2b09091b853feac8df8f125e4274
(cherry picked from commit afc2cf0dec)
Exempt-From-Owner-Approval: cherry-pick
71 lines
1.6 KiB
Text
71 lines
1.6 KiB
Text
// Copyright (C) 2020 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
cc_defaults {
|
|
name: "libadb_tls_connection_defaults",
|
|
cflags: [
|
|
"-Wall",
|
|
"-Wextra",
|
|
"-Wthread-safety",
|
|
"-Werror",
|
|
],
|
|
|
|
compile_multilib: "both",
|
|
|
|
srcs: [
|
|
"adb_ca_list.cpp",
|
|
"tls_connection.cpp",
|
|
],
|
|
target: {
|
|
windows: {
|
|
compile_multilib: "first",
|
|
enabled: true,
|
|
},
|
|
},
|
|
export_include_dirs: ["include"],
|
|
|
|
host_supported: true,
|
|
recovery_available: true,
|
|
|
|
visibility: [
|
|
"//system/core/adb:__subpackages__",
|
|
],
|
|
|
|
shared_libs: [
|
|
"libbase",
|
|
"libcrypto",
|
|
"liblog",
|
|
"libssl",
|
|
],
|
|
}
|
|
|
|
cc_library {
|
|
name: "libadb_tls_connection",
|
|
defaults: ["libadb_tls_connection_defaults"],
|
|
|
|
apex_available: [
|
|
"com.android.adbd",
|
|
"test_com.android.adbd",
|
|
],
|
|
}
|
|
|
|
// For running atest (b/147158681)
|
|
cc_library_static {
|
|
name: "libadb_tls_connection_static",
|
|
defaults: ["libadb_tls_connection_defaults"],
|
|
|
|
apex_available: [
|
|
"//apex_available:platform",
|
|
],
|
|
}
|