Merge "Differentiate usages of word "include" in cc_sdk_test.go"

This commit is contained in:
Paul Duffin
2021-02-23 15:29:47 +00:00
committed by Gerrit Code Review

View File

@@ -22,14 +22,14 @@ import (
) )
var ccTestFs = map[string][]byte{ var ccTestFs = map[string][]byte{
"Test.cpp": nil, "Test.cpp": nil,
"include/Test.h": nil, "myinclude/Test.h": nil,
"include-android/AndroidTest.h": nil, "myinclude-android/AndroidTest.h": nil,
"include-host/HostTest.h": nil, "myinclude-host/HostTest.h": nil,
"arm64/include/Arm64Test.h": nil, "arm64/include/Arm64Test.h": nil,
"libfoo.so": nil, "libfoo.so": nil,
"aidl/foo/bar/Test.aidl": nil, "aidl/foo/bar/Test.aidl": nil,
"some/where/stubslib.map.txt": nil, "some/where/stubslib.map.txt": nil,
} }
func testSdkWithCc(t *testing.T, bp string) *testSdkResult { func testSdkWithCc(t *testing.T, bp string) *testSdkResult {
@@ -423,7 +423,7 @@ func TestSnapshotWithCcDuplicateHeaders(t *testing.T) {
srcs: [ srcs: [
"Test.cpp", "Test.cpp",
], ],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
stl: "none", stl: "none",
} }
@@ -432,14 +432,14 @@ func TestSnapshotWithCcDuplicateHeaders(t *testing.T) {
srcs: [ srcs: [
"Test.cpp", "Test.cpp",
], ],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
stl: "none", stl: "none",
} }
`) `)
result.CheckSnapshot("mysdk", "", result.CheckSnapshot("mysdk", "",
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
.intermediates/mynativelib1/android_arm64_armv8-a_shared/mynativelib1.so -> arm64/lib/mynativelib1.so .intermediates/mynativelib1/android_arm64_armv8-a_shared/mynativelib1.so -> arm64/lib/mynativelib1.so
.intermediates/mynativelib1/android_arm_armv7-a-neon_shared/mynativelib1.so -> arm/lib/mynativelib1.so .intermediates/mynativelib1/android_arm_armv7-a-neon_shared/mynativelib1.so -> arm/lib/mynativelib1.so
.intermediates/mynativelib2/android_arm64_armv8-a_shared/mynativelib2.so -> arm64/lib/mynativelib2.so .intermediates/mynativelib2/android_arm64_armv8-a_shared/mynativelib2.so -> arm64/lib/mynativelib2.so
@@ -466,7 +466,7 @@ func TestSnapshotWithCcExportGeneratedHeaders(t *testing.T) {
export_generated_headers: [ export_generated_headers: [
"generated_foo", "generated_foo",
], ],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
stl: "none", stl: "none",
} }
@@ -494,7 +494,7 @@ cc_prebuilt_library_shared {
apex_available: ["//apex_available:platform"], apex_available: ["//apex_available:platform"],
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
arch: { arch: {
arm64: { arm64: {
srcs: ["arm64/lib/mynativelib.so"], srcs: ["arm64/lib/mynativelib.so"],
@@ -514,7 +514,7 @@ cc_prebuilt_library_shared {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
.intermediates/mynativelib/android_arm64_armv8-a_shared/mynativelib.so -> arm64/lib/mynativelib.so .intermediates/mynativelib/android_arm64_armv8-a_shared/mynativelib.so -> arm64/lib/mynativelib.so
.intermediates/generated_foo/gen/generated_foo/protos/foo/bar.h -> arm64/include_gen/mynativelib/generated_foo/protos/foo/bar.h .intermediates/generated_foo/gen/generated_foo/protos/foo/bar.h -> arm64/include_gen/mynativelib/generated_foo/protos/foo/bar.h
.intermediates/mynativelib/android_arm_armv7-a-neon_shared/mynativelib.so -> arm/lib/mynativelib.so .intermediates/mynativelib/android_arm_armv7-a-neon_shared/mynativelib.so -> arm/lib/mynativelib.so
@@ -540,7 +540,7 @@ func TestSnapshotWithCcSharedLibraryCommonProperties(t *testing.T) {
"Test.cpp", "Test.cpp",
"aidl/foo/bar/Test.aidl", "aidl/foo/bar/Test.aidl",
], ],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
sanitize: { sanitize: {
fuzzer: false, fuzzer: false,
integer_overflow: true, integer_overflow: true,
@@ -569,7 +569,7 @@ cc_prebuilt_library_shared {
apex_available: ["//apex_available:platform"], apex_available: ["//apex_available:platform"],
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
sanitize: { sanitize: {
fuzzer: false, fuzzer: false,
diag: { diag: {
@@ -594,7 +594,7 @@ cc_prebuilt_library_shared {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
.intermediates/mynativelib/android_arm64_armv8-a_shared/mynativelib.so -> arm64/lib/mynativelib.so .intermediates/mynativelib/android_arm64_armv8-a_shared/mynativelib.so -> arm64/lib/mynativelib.so
arm64/include/Arm64Test.h -> arm64/include/arm64/include/Arm64Test.h arm64/include/Arm64Test.h -> arm64/include/arm64/include/Arm64Test.h
.intermediates/mynativelib/android_arm_armv7-a-neon_shared/mynativelib.so -> arm/lib/mynativelib.so`), .intermediates/mynativelib/android_arm_armv7-a-neon_shared/mynativelib.so -> arm/lib/mynativelib.so`),
@@ -1093,7 +1093,7 @@ func TestSnapshotWithCcSharedLibrary(t *testing.T) {
"aidl/foo/bar/Test.aidl", "aidl/foo/bar/Test.aidl",
], ],
apex_available: ["apex1", "apex2"], apex_available: ["apex1", "apex2"],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
aidl: { aidl: {
export_aidl_headers: true, export_aidl_headers: true,
}, },
@@ -1115,7 +1115,7 @@ cc_prebuilt_library_shared {
], ],
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
arch: { arch: {
arm64: { arm64: {
srcs: ["arm64/lib/mynativelib.so"], srcs: ["arm64/lib/mynativelib.so"],
@@ -1129,7 +1129,7 @@ cc_prebuilt_library_shared {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
.intermediates/mynativelib/android_arm64_armv8-a_shared/mynativelib.so -> arm64/lib/mynativelib.so .intermediates/mynativelib/android_arm64_armv8-a_shared/mynativelib.so -> arm64/lib/mynativelib.so
.intermediates/mynativelib/android_arm64_armv8-a_shared/gen/aidl/aidl/foo/bar/Test.h -> arm64/include_gen/mynativelib/aidl/foo/bar/Test.h .intermediates/mynativelib/android_arm64_armv8-a_shared/gen/aidl/aidl/foo/bar/Test.h -> arm64/include_gen/mynativelib/aidl/foo/bar/Test.h
.intermediates/mynativelib/android_arm64_armv8-a_shared/gen/aidl/aidl/foo/bar/BnTest.h -> arm64/include_gen/mynativelib/aidl/foo/bar/BnTest.h .intermediates/mynativelib/android_arm64_armv8-a_shared/gen/aidl/aidl/foo/bar/BnTest.h -> arm64/include_gen/mynativelib/aidl/foo/bar/BnTest.h
@@ -1290,7 +1290,7 @@ func TestHostSnapshotWithCcSharedLibrary(t *testing.T) {
"Test.cpp", "Test.cpp",
"aidl/foo/bar/Test.aidl", "aidl/foo/bar/Test.aidl",
], ],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
aidl: { aidl: {
export_aidl_headers: true, export_aidl_headers: true,
}, },
@@ -1313,7 +1313,7 @@ cc_prebuilt_library_shared {
sdk_version: "minimum", sdk_version: "minimum",
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
@@ -1345,7 +1345,7 @@ cc_prebuilt_library_shared {
sdk_version: "minimum", sdk_version: "minimum",
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
@@ -1383,7 +1383,7 @@ sdk_snapshot {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
.intermediates/mynativelib/linux_glibc_x86_64_shared/mynativelib.so -> x86_64/lib/mynativelib.so .intermediates/mynativelib/linux_glibc_x86_64_shared/mynativelib.so -> x86_64/lib/mynativelib.so
.intermediates/mynativelib/linux_glibc_x86_64_shared/gen/aidl/aidl/foo/bar/Test.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/Test.h .intermediates/mynativelib/linux_glibc_x86_64_shared/gen/aidl/aidl/foo/bar/Test.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/Test.h
.intermediates/mynativelib/linux_glibc_x86_64_shared/gen/aidl/aidl/foo/bar/BnTest.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/BnTest.h .intermediates/mynativelib/linux_glibc_x86_64_shared/gen/aidl/aidl/foo/bar/BnTest.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/BnTest.h
@@ -1546,7 +1546,7 @@ func TestSnapshotWithCcStaticLibrary(t *testing.T) {
"Test.cpp", "Test.cpp",
"aidl/foo/bar/Test.aidl", "aidl/foo/bar/Test.aidl",
], ],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
aidl: { aidl: {
export_aidl_headers: true, export_aidl_headers: true,
}, },
@@ -1565,7 +1565,7 @@ cc_prebuilt_library_static {
apex_available: ["//apex_available:platform"], apex_available: ["//apex_available:platform"],
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
arch: { arch: {
arm64: { arm64: {
srcs: ["arm64/lib/mynativelib.a"], srcs: ["arm64/lib/mynativelib.a"],
@@ -1579,7 +1579,7 @@ cc_prebuilt_library_static {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
.intermediates/mynativelib/android_arm64_armv8-a_static/mynativelib.a -> arm64/lib/mynativelib.a .intermediates/mynativelib/android_arm64_armv8-a_static/mynativelib.a -> arm64/lib/mynativelib.a
.intermediates/mynativelib/android_arm64_armv8-a_static/gen/aidl/aidl/foo/bar/Test.h -> arm64/include_gen/mynativelib/aidl/foo/bar/Test.h .intermediates/mynativelib/android_arm64_armv8-a_static/gen/aidl/aidl/foo/bar/Test.h -> arm64/include_gen/mynativelib/aidl/foo/bar/Test.h
.intermediates/mynativelib/android_arm64_armv8-a_static/gen/aidl/aidl/foo/bar/BnTest.h -> arm64/include_gen/mynativelib/aidl/foo/bar/BnTest.h .intermediates/mynativelib/android_arm64_armv8-a_static/gen/aidl/aidl/foo/bar/BnTest.h -> arm64/include_gen/mynativelib/aidl/foo/bar/BnTest.h
@@ -1609,7 +1609,7 @@ func TestHostSnapshotWithCcStaticLibrary(t *testing.T) {
"Test.cpp", "Test.cpp",
"aidl/foo/bar/Test.aidl", "aidl/foo/bar/Test.aidl",
], ],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
aidl: { aidl: {
export_aidl_headers: true, export_aidl_headers: true,
}, },
@@ -1630,7 +1630,7 @@ cc_prebuilt_library_static {
host_supported: true, host_supported: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
@@ -1661,7 +1661,7 @@ cc_prebuilt_library_static {
installable: false, installable: false,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
@@ -1699,7 +1699,7 @@ module_exports_snapshot {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
.intermediates/mynativelib/linux_glibc_x86_64_static/mynativelib.a -> x86_64/lib/mynativelib.a .intermediates/mynativelib/linux_glibc_x86_64_static/mynativelib.a -> x86_64/lib/mynativelib.a
.intermediates/mynativelib/linux_glibc_x86_64_static/gen/aidl/aidl/foo/bar/Test.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/Test.h .intermediates/mynativelib/linux_glibc_x86_64_static/gen/aidl/aidl/foo/bar/Test.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/Test.h
.intermediates/mynativelib/linux_glibc_x86_64_static/gen/aidl/aidl/foo/bar/BnTest.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/BnTest.h .intermediates/mynativelib/linux_glibc_x86_64_static/gen/aidl/aidl/foo/bar/BnTest.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/BnTest.h
@@ -1724,7 +1724,7 @@ func TestSnapshotWithCcLibrary(t *testing.T) {
srcs: [ srcs: [
"Test.cpp", "Test.cpp",
], ],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
stl: "none", stl: "none",
recovery_available: true, recovery_available: true,
vendor_available: true, vendor_available: true,
@@ -1744,7 +1744,7 @@ cc_prebuilt_library {
vendor_available: true, vendor_available: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
arch: { arch: {
arm64: { arm64: {
static: { static: {
@@ -1779,7 +1779,7 @@ cc_prebuilt_library {
vendor_available: true, vendor_available: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
arch: { arch: {
arm64: { arm64: {
static: { static: {
@@ -1807,7 +1807,7 @@ module_exports_snapshot {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
.intermediates/mynativelib/android_arm64_armv8-a_static/mynativelib.a -> arm64/lib/mynativelib.a .intermediates/mynativelib/android_arm64_armv8-a_static/mynativelib.a -> arm64/lib/mynativelib.a
.intermediates/mynativelib/android_arm64_armv8-a_shared/mynativelib.so -> arm64/lib/mynativelib.so .intermediates/mynativelib/android_arm64_armv8-a_shared/mynativelib.so -> arm64/lib/mynativelib.so
.intermediates/mynativelib/android_arm_armv7-a-neon_static/mynativelib.a -> arm/lib/mynativelib.a .intermediates/mynativelib/android_arm_armv7-a-neon_static/mynativelib.a -> arm/lib/mynativelib.a
@@ -1837,7 +1837,7 @@ func TestHostSnapshotWithMultiLib64(t *testing.T) {
"Test.cpp", "Test.cpp",
"aidl/foo/bar/Test.aidl", "aidl/foo/bar/Test.aidl",
], ],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
aidl: { aidl: {
export_aidl_headers: true, export_aidl_headers: true,
}, },
@@ -1858,7 +1858,7 @@ cc_prebuilt_library_static {
host_supported: true, host_supported: true,
stl: "none", stl: "none",
compile_multilib: "64", compile_multilib: "64",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
@@ -1884,7 +1884,7 @@ cc_prebuilt_library_static {
installable: false, installable: false,
stl: "none", stl: "none",
compile_multilib: "64", compile_multilib: "64",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
@@ -1915,7 +1915,7 @@ module_exports_snapshot {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
.intermediates/mynativelib/linux_glibc_x86_64_static/mynativelib.a -> x86_64/lib/mynativelib.a .intermediates/mynativelib/linux_glibc_x86_64_static/mynativelib.a -> x86_64/lib/mynativelib.a
.intermediates/mynativelib/linux_glibc_x86_64_static/gen/aidl/aidl/foo/bar/Test.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/Test.h .intermediates/mynativelib/linux_glibc_x86_64_static/gen/aidl/aidl/foo/bar/Test.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/Test.h
.intermediates/mynativelib/linux_glibc_x86_64_static/gen/aidl/aidl/foo/bar/BnTest.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/BnTest.h .intermediates/mynativelib/linux_glibc_x86_64_static/gen/aidl/aidl/foo/bar/BnTest.h -> x86_64/include_gen/mynativelib/aidl/foo/bar/BnTest.h
@@ -1933,7 +1933,7 @@ func TestSnapshotWithCcHeadersLibrary(t *testing.T) {
cc_library_headers { cc_library_headers {
name: "mynativeheaders", name: "mynativeheaders",
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
stl: "none", stl: "none",
} }
`) `)
@@ -1949,11 +1949,11 @@ cc_prebuilt_library_headers {
apex_available: ["//apex_available:platform"], apex_available: ["//apex_available:platform"],
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
`), `),
) )
} }
@@ -1971,7 +1971,7 @@ func TestHostSnapshotWithCcHeadersLibrary(t *testing.T) {
name: "mynativeheaders", name: "mynativeheaders",
device_supported: false, device_supported: false,
host_supported: true, host_supported: true,
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
stl: "none", stl: "none",
} }
`) `)
@@ -1989,7 +1989,7 @@ cc_prebuilt_library_headers {
host_supported: true, host_supported: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
@@ -2015,7 +2015,7 @@ cc_prebuilt_library_headers {
host_supported: true, host_supported: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
@@ -2049,7 +2049,7 @@ sdk_snapshot {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
`), `),
) )
} }
@@ -2066,13 +2066,13 @@ func TestDeviceAndHostSnapshotWithCcHeadersLibrary(t *testing.T) {
name: "mynativeheaders", name: "mynativeheaders",
host_supported: true, host_supported: true,
stl: "none", stl: "none",
export_system_include_dirs: ["include"], export_system_include_dirs: ["myinclude"],
target: { target: {
android: { android: {
export_include_dirs: ["include-android"], export_include_dirs: ["myinclude-android"],
}, },
host: { host: {
export_include_dirs: ["include-host"], export_include_dirs: ["myinclude-host"],
}, },
}, },
} }
@@ -2090,16 +2090,16 @@ cc_prebuilt_library_headers {
host_supported: true, host_supported: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_system_include_dirs: ["common_os/include/include"], export_system_include_dirs: ["common_os/include/myinclude"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
}, },
android: { android: {
export_include_dirs: ["android/include/include-android"], export_include_dirs: ["android/include/myinclude-android"],
}, },
linux_glibc: { linux_glibc: {
export_include_dirs: ["linux_glibc/include/include-host"], export_include_dirs: ["linux_glibc/include/myinclude-host"],
}, },
linux_glibc_x86_64: { linux_glibc_x86_64: {
enabled: true, enabled: true,
@@ -2122,16 +2122,16 @@ cc_prebuilt_library_headers {
host_supported: true, host_supported: true,
stl: "none", stl: "none",
compile_multilib: "both", compile_multilib: "both",
export_system_include_dirs: ["common_os/include/include"], export_system_include_dirs: ["common_os/include/myinclude"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
}, },
android: { android: {
export_include_dirs: ["android/include/include-android"], export_include_dirs: ["android/include/myinclude-android"],
}, },
linux_glibc: { linux_glibc: {
export_include_dirs: ["linux_glibc/include/include-host"], export_include_dirs: ["linux_glibc/include/myinclude-host"],
}, },
linux_glibc_x86_64: { linux_glibc_x86_64: {
enabled: true, enabled: true,
@@ -2161,9 +2161,9 @@ sdk_snapshot {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> common_os/include/include/Test.h myinclude/Test.h -> common_os/include/myinclude/Test.h
include-android/AndroidTest.h -> android/include/include-android/AndroidTest.h myinclude-android/AndroidTest.h -> android/include/myinclude-android/AndroidTest.h
include-host/HostTest.h -> linux_glibc/include/include-host/HostTest.h myinclude-host/HostTest.h -> linux_glibc/include/myinclude-host/HostTest.h
`), `),
) )
} }
@@ -2644,7 +2644,7 @@ func TestNoSanitizerMembers(t *testing.T) {
cc_library_shared { cc_library_shared {
name: "mynativelib", name: "mynativelib",
srcs: ["Test.cpp"], srcs: ["Test.cpp"],
export_include_dirs: ["include"], export_include_dirs: ["myinclude"],
arch: { arch: {
arm64: { arm64: {
export_system_include_dirs: ["arm64/include"], export_system_include_dirs: ["arm64/include"],
@@ -2666,7 +2666,7 @@ cc_prebuilt_library_shared {
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
apex_available: ["//apex_available:platform"], apex_available: ["//apex_available:platform"],
compile_multilib: "both", compile_multilib: "both",
export_include_dirs: ["include/include"], export_include_dirs: ["include/myinclude"],
arch: { arch: {
arm64: { arm64: {
export_system_include_dirs: ["arm64/include/arm64/include"], export_system_include_dirs: ["arm64/include/arm64/include"],
@@ -2678,7 +2678,7 @@ cc_prebuilt_library_shared {
} }
`), `),
checkAllCopyRules(` checkAllCopyRules(`
include/Test.h -> include/include/Test.h myinclude/Test.h -> include/myinclude/Test.h
arm64/include/Arm64Test.h -> arm64/include/arm64/include/Arm64Test.h arm64/include/Arm64Test.h -> arm64/include/arm64/include/Arm64Test.h
.intermediates/mynativelib/android_arm_armv7-a-neon_shared/mynativelib.so -> arm/lib/mynativelib.so`), .intermediates/mynativelib/android_arm_armv7-a-neon_shared/mynativelib.so -> arm/lib/mynativelib.so`),
) )