summaryrefslogtreecommitdiff
path: root/sdk/cc_sdk_test.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2020-03-04 14:52:46 +0000
committer Paul Duffin <paulduffin@google.com> 2020-03-11 18:31:45 +0000
commit0cb37b9ce185971ff0436c700224d7df7dfdcd4e (patch)
treea494f4d91ca1ea1dfa49fcbf52095fc324fdea10 /sdk/cc_sdk_test.go
parentf53737fadce6b2ffda3438593cf48bf7314cfb18 (diff)
Disable installation for sdk snapshot versioned prebuilts
The sdk snapshot creates two prebuilts for each member one that is versioned and one that is not. If they are both installed then they lead to duplicate rules in make for creating the same installed file. This change adds an installable property to cc modules that will prevent the installation of the file and then adds installable: false on the versioned prebuilt for cc modules. Bug: 142935992 Test: m nothing Change-Id: I4cb294c2b0c8a3f411eea569775835d9e41726d6
Diffstat (limited to 'sdk/cc_sdk_test.go')
-rw-r--r--sdk/cc_sdk_test.go9
1 files changed, 9 insertions, 0 deletions
diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go
index 11bc90238..2b0fd3c93 100644
--- a/sdk/cc_sdk_test.go
+++ b/sdk/cc_sdk_test.go
@@ -297,6 +297,7 @@ func TestSnapshotWithCcSharedLibraryCommonProperties(t *testing.T) {
cc_prebuilt_library_shared {
name: "mysdk_mynativelib@current",
sdk_member_name: "mynativelib",
+ installable: false,
export_include_dirs: ["include/include"],
arch: {
arm64: {
@@ -366,6 +367,7 @@ func TestSnapshotWithCcBinary(t *testing.T) {
cc_prebuilt_binary {
name: "mymodule_exports_mynativebinary@current",
sdk_member_name: "mynativebinary",
+ installable: false,
compile_multilib: "both",
arch: {
arm64: {
@@ -447,6 +449,7 @@ cc_prebuilt_binary {
sdk_member_name: "mynativebinary",
device_supported: false,
host_supported: true,
+ installable: false,
target: {
linux_glibc: {
compile_multilib: "both",
@@ -539,6 +542,7 @@ cc_prebuilt_library_shared {
"apex1",
"apex2",
],
+ installable: false,
export_include_dirs: ["include/include"],
arch: {
arm64: {
@@ -634,6 +638,7 @@ cc_prebuilt_library_shared {
sdk_member_name: "mynativelib",
device_supported: false,
host_supported: true,
+ installable: false,
sdk_version: "minimum",
export_include_dirs: ["include/include"],
arch: {
@@ -735,6 +740,7 @@ cc_prebuilt_library_shared {
sdk_member_name: "mynativelib",
device_supported: false,
host_supported: true,
+ installable: false,
target: {
linux_glibc_x86_64: {
srcs: ["linux_glibc/x86_64/lib/mynativelib.so"],
@@ -814,6 +820,7 @@ func TestSnapshotWithCcStaticLibrary(t *testing.T) {
cc_prebuilt_library_static {
name: "myexports_mynativelib@current",
sdk_member_name: "mynativelib",
+ installable: false,
export_include_dirs: ["include/include"],
arch: {
arm64: {
@@ -904,6 +911,7 @@ cc_prebuilt_library_static {
sdk_member_name: "mynativelib",
device_supported: false,
host_supported: true,
+ installable: false,
export_include_dirs: ["include/include"],
arch: {
x86_64: {
@@ -1003,6 +1011,7 @@ cc_prebuilt_library_static {
sdk_member_name: "mynativelib",
device_supported: false,
host_supported: true,
+ installable: false,
export_include_dirs: ["include/include"],
arch: {
x86_64: {