Switch from idmap to idmap2. This CL is the safety pin for idmap2. If idmap2 causes issues during dogfooding it is easy go back to idmap by reverting this CL. Once idmap2 has proven itself during a suitable period of time, the FEATURE_FLAG_IDMAP2 flag and the obsolete idmap code will be removed. Also add an .rc file to tell init to launch idmap2d. Bug: 78815803 Test: atest OverlayDeviceTests OverlayHostTests Change-Id: I5ca1388ac2f8a9379fed0c257247d351a5c7a3c4
193 lines
4.7 KiB
Plaintext
193 lines
4.7 KiB
Plaintext
// Copyright (C) 2018 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_library {
|
|
name: "libidmap2",
|
|
host_supported: true,
|
|
tidy: true,
|
|
tidy_flags: [
|
|
"-system-headers",
|
|
// b/120024673 "-warnings-as-errors=*",
|
|
],
|
|
srcs: [
|
|
"libidmap2/BinaryStreamVisitor.cpp",
|
|
"libidmap2/CommandLineOptions.cpp",
|
|
"libidmap2/FileUtils.cpp",
|
|
"libidmap2/Idmap.cpp",
|
|
"libidmap2/PrettyPrintVisitor.cpp",
|
|
"libidmap2/RawPrintVisitor.cpp",
|
|
"libidmap2/ResourceUtils.cpp",
|
|
"libidmap2/Xml.cpp",
|
|
"libidmap2/ZipFile.cpp",
|
|
],
|
|
export_include_dirs: ["include"],
|
|
target: {
|
|
android: {
|
|
static: {
|
|
enabled: false,
|
|
},
|
|
shared_libs: [
|
|
"libandroidfw",
|
|
"libbase",
|
|
"libutils",
|
|
"libziparchive",
|
|
],
|
|
},
|
|
host: {
|
|
shared: {
|
|
enabled: false,
|
|
},
|
|
static_libs: [
|
|
"libandroidfw",
|
|
"libbase",
|
|
"libutils",
|
|
"libziparchive",
|
|
],
|
|
},
|
|
},
|
|
}
|
|
|
|
cc_test {
|
|
name: "idmap2_tests",
|
|
host_supported: true,
|
|
tidy: true,
|
|
tidy_flags: [
|
|
"-system-headers",
|
|
// b/120024673 "-warnings-as-errors=*",
|
|
],
|
|
srcs: [
|
|
"tests/BinaryStreamVisitorTests.cpp",
|
|
"tests/CommandLineOptionsTests.cpp",
|
|
"tests/FileUtilsTests.cpp",
|
|
"tests/Idmap2BinaryTests.cpp",
|
|
"tests/IdmapTests.cpp",
|
|
"tests/Main.cpp",
|
|
"tests/PrettyPrintVisitorTests.cpp",
|
|
"tests/RawPrintVisitorTests.cpp",
|
|
"tests/ResourceUtilsTests.cpp",
|
|
"tests/XmlTests.cpp",
|
|
"tests/ZipFileTests.cpp",
|
|
],
|
|
required: [
|
|
"idmap2",
|
|
],
|
|
static_libs: ["libgmock"],
|
|
target: {
|
|
android: {
|
|
shared_libs: [
|
|
"libandroidfw",
|
|
"libbase",
|
|
"libidmap2",
|
|
"liblog",
|
|
"libutils",
|
|
"libz",
|
|
"libziparchive",
|
|
],
|
|
},
|
|
host: {
|
|
static_libs: [
|
|
"libandroidfw",
|
|
"libbase",
|
|
"libidmap2",
|
|
"liblog",
|
|
"libutils",
|
|
"libziparchive",
|
|
],
|
|
shared_libs: [
|
|
"libz",
|
|
],
|
|
},
|
|
},
|
|
data: ["tests/data/**/*.apk"],
|
|
}
|
|
|
|
cc_binary {
|
|
name: "idmap2",
|
|
host_supported: true,
|
|
tidy: true,
|
|
tidy_flags: [
|
|
"-system-headers",
|
|
// b/120024673 "-warnings-as-errors=*",
|
|
],
|
|
srcs: [
|
|
"idmap2/Create.cpp",
|
|
"idmap2/Dump.cpp",
|
|
"idmap2/Lookup.cpp",
|
|
"idmap2/Main.cpp",
|
|
"idmap2/Scan.cpp",
|
|
"idmap2/Verify.cpp",
|
|
],
|
|
target: {
|
|
android: {
|
|
shared_libs: [
|
|
"libandroidfw",
|
|
"libbase",
|
|
"libidmap2",
|
|
"libutils",
|
|
"libziparchive",
|
|
],
|
|
},
|
|
host: {
|
|
static_libs: [
|
|
"libandroidfw",
|
|
"libbase",
|
|
"libidmap2",
|
|
"liblog",
|
|
"libutils",
|
|
"libziparchive",
|
|
],
|
|
shared_libs: [
|
|
"libz",
|
|
],
|
|
},
|
|
},
|
|
}
|
|
|
|
cc_binary {
|
|
name: "idmap2d",
|
|
host_supported: false,
|
|
tidy: true,
|
|
tidy_checks: [
|
|
// remove google-default-arguments or clang-tidy will complain about
|
|
// the auto-generated file IIdmap2.cpp
|
|
"-google-default-arguments",
|
|
],
|
|
tidy_flags: [
|
|
"-system-headers",
|
|
// b/120024673 "-warnings-as-errors=*",
|
|
],
|
|
srcs: [
|
|
":idmap2_aidl",
|
|
"idmap2d/Idmap2Service.cpp",
|
|
"idmap2d/Main.cpp",
|
|
],
|
|
shared_libs: [
|
|
"libandroidfw",
|
|
"libbase",
|
|
"libbinder",
|
|
"libcutils",
|
|
"libidmap2",
|
|
"libutils",
|
|
"libziparchive",
|
|
],
|
|
init_rc: ["idmap2d/idmap2d.rc"],
|
|
}
|
|
|
|
filegroup {
|
|
name: "idmap2_aidl",
|
|
srcs: [
|
|
"idmap2d/aidl/android/os/IIdmap2.aidl",
|
|
],
|
|
}
|