Merge "The latest version of finalization scripts."
diff --git a/core/Makefile b/core/Makefile
index 955b360..8bd6796 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4566,7 +4566,7 @@
$(APEX_INFO_FILE): $(HOST_OUT_EXECUTABLES)/dump_apex_info $(apex_vintf_files)
@echo "Creating apex-info-file in $(PRODUCT_OUT) "
- $< --root_dir $(PRODUCT_OUT) --out_file $@
+ $< --root_dir $(PRODUCT_OUT)
apex_vintf_files :=
@@ -4768,7 +4768,6 @@
ifdef PRODUCT_SHIPPING_API_LEVEL
check_vintf_compatible_args += --property ro.product.first_api_level=$(PRODUCT_SHIPPING_API_LEVEL)
endif # PRODUCT_SHIPPING_API_LEVEL
-check_vintf_compatible_args += --apex-info-file $(APEX_INFO_FILE)
$(check_vintf_compatible_log): PRIVATE_CHECK_VINTF_ARGS := $(check_vintf_compatible_args)
$(check_vintf_compatible_log): PRIVATE_CHECK_VINTF_DEPS := $(check_vintf_compatible_deps)
diff --git a/core/config.mk b/core/config.mk
index 9e09faf..f5bb7ef 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -695,6 +695,14 @@
PRODUCT_FULL_TREBLE_OVERRIDE ?=
$(foreach req,$(requirements),$(eval $(req)_OVERRIDE ?=))
+ifneq ($(PRODUCT_SEPOLICY_SPLIT),true)
+# WARNING: DO NOT CHANGE: if you are downstream of AOSP, and you change this, without
+# letting upstream know it's important to you, we may do cleanup which breaks this
+# significantly. Please let us know if you are changing this.
+# TODO(b/257176017) - unsplit sepolicy is no longer supported
+PRODUCT_SEPOLICY_SPLIT := true
+endif
+
# TODO(b/114488870): disallow PRODUCT_FULL_TREBLE_OVERRIDE from being used.
.KATI_READONLY := \
PRODUCT_FULL_TREBLE_OVERRIDE \
diff --git a/tools/compliance/cmd/dumpgraph/dumpgraph_test.go b/tools/compliance/cmd/dumpgraph/dumpgraph_test.go
index d1deed3..e2d0db0 100644
--- a/tools/compliance/cmd/dumpgraph/dumpgraph_test.go
+++ b/tools/compliance/cmd/dumpgraph/dumpgraph_test.go
@@ -341,13 +341,13 @@
roots: []string{"highest.apex.meta_lic"},
ctx: context{stripPrefix: []string{"testdata/restricted/"}, labelConditions: true},
expectedOut: []string{
- "bin/bin1.meta_lic:notice lib/liba.so.meta_lic:restricted_allows_dynamic_linking static",
+ "bin/bin1.meta_lic:notice lib/liba.so.meta_lic:restricted_if_statically_linked static",
"bin/bin1.meta_lic:notice lib/libc.a.meta_lic:reciprocal static",
"bin/bin2.meta_lic:notice lib/libb.so.meta_lic:restricted dynamic",
"bin/bin2.meta_lic:notice lib/libd.so.meta_lic:notice dynamic",
"highest.apex.meta_lic:notice bin/bin1.meta_lic:notice static",
"highest.apex.meta_lic:notice bin/bin2.meta_lic:notice static",
- "highest.apex.meta_lic:notice lib/liba.so.meta_lic:restricted_allows_dynamic_linking static",
+ "highest.apex.meta_lic:notice lib/liba.so.meta_lic:restricted_if_statically_linked static",
"highest.apex.meta_lic:notice lib/libb.so.meta_lic:restricted static",
},
},
@@ -1011,7 +1011,7 @@
matchTarget("bin/bin1.meta_lic", "notice"),
matchTarget("bin/bin2.meta_lic", "notice"),
matchTarget("highest.apex.meta_lic", "notice"),
- matchTarget("lib/liba.so.meta_lic", "restricted_allows_dynamic_linking"),
+ matchTarget("lib/liba.so.meta_lic", "restricted_if_statically_linked"),
matchTarget("lib/libb.so.meta_lic", "restricted"),
matchTarget("lib/libc.a.meta_lic", "reciprocal"),
matchTarget("lib/libd.so.meta_lic", "notice"),
diff --git a/tools/compliance/cmd/dumpresolutions/dumpresolutions_test.go b/tools/compliance/cmd/dumpresolutions/dumpresolutions_test.go
index 63fd157..227942b 100644
--- a/tools/compliance/cmd/dumpresolutions/dumpresolutions_test.go
+++ b/tools/compliance/cmd/dumpresolutions/dumpresolutions_test.go
@@ -529,18 +529,18 @@
name: "apex",
roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{
- "testdata/restricted/bin/bin1.meta_lic testdata/restricted/bin/bin1.meta_lic notice:restricted_allows_dynamic_linking",
- "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",
- "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
+ "testdata/restricted/bin/bin1.meta_lic testdata/restricted/bin/bin1.meta_lic notice:restricted_if_statically_linked",
+ "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",
+ "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
"testdata/restricted/bin/bin2.meta_lic testdata/restricted/bin/bin2.meta_lic notice:restricted",
"testdata/restricted/bin/bin2.meta_lic testdata/restricted/lib/libb.so.meta_lic restricted",
- "testdata/restricted/highest.apex.meta_lic testdata/restricted/bin/bin1.meta_lic notice:restricted_allows_dynamic_linking",
+ "testdata/restricted/highest.apex.meta_lic testdata/restricted/bin/bin1.meta_lic notice:restricted_if_statically_linked",
"testdata/restricted/highest.apex.meta_lic testdata/restricted/bin/bin2.meta_lic notice:restricted",
- "testdata/restricted/highest.apex.meta_lic testdata/restricted/highest.apex.meta_lic notice:restricted:restricted_allows_dynamic_linking",
- "testdata/restricted/highest.apex.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "testdata/restricted/highest.apex.meta_lic testdata/restricted/highest.apex.meta_lic notice:restricted:restricted_if_statically_linked",
+ "testdata/restricted/highest.apex.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",
"testdata/restricted/highest.apex.meta_lic testdata/restricted/lib/libb.so.meta_lic restricted",
- "testdata/restricted/highest.apex.meta_lic testdata/restricted/lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
- "testdata/restricted/lib/liba.so.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "testdata/restricted/highest.apex.meta_lic testdata/restricted/lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
+ "testdata/restricted/lib/liba.so.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",
"testdata/restricted/lib/libb.so.meta_lic testdata/restricted/lib/libb.so.meta_lic restricted",
},
},
@@ -550,18 +550,18 @@
roots: []string{"highest.apex.meta_lic"},
ctx: context{stripPrefix: []string{"testdata/restricted/"}},
expectedOut: []string{
- "bin/bin1.meta_lic bin/bin1.meta_lic notice:restricted_allows_dynamic_linking",
- "bin/bin1.meta_lic lib/liba.so.meta_lic restricted_allows_dynamic_linking",
- "bin/bin1.meta_lic lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
+ "bin/bin1.meta_lic bin/bin1.meta_lic notice:restricted_if_statically_linked",
+ "bin/bin1.meta_lic lib/liba.so.meta_lic restricted_if_statically_linked",
+ "bin/bin1.meta_lic lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
"bin/bin2.meta_lic bin/bin2.meta_lic notice:restricted",
"bin/bin2.meta_lic lib/libb.so.meta_lic restricted",
- "highest.apex.meta_lic bin/bin1.meta_lic notice:restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic bin/bin1.meta_lic notice:restricted_if_statically_linked",
"highest.apex.meta_lic bin/bin2.meta_lic notice:restricted",
- "highest.apex.meta_lic highest.apex.meta_lic notice:restricted:restricted_allows_dynamic_linking",
- "highest.apex.meta_lic lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic highest.apex.meta_lic notice:restricted:restricted_if_statically_linked",
+ "highest.apex.meta_lic lib/liba.so.meta_lic restricted_if_statically_linked",
"highest.apex.meta_lic lib/libb.so.meta_lic restricted",
- "highest.apex.meta_lic lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
- "lib/liba.so.meta_lic lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
+ "lib/liba.so.meta_lic lib/liba.so.meta_lic restricted_if_statically_linked",
"lib/libb.so.meta_lic lib/libb.so.meta_lic restricted",
},
},
@@ -590,18 +590,18 @@
stripPrefix: []string{"testdata/restricted/"},
},
expectedOut: []string{
- "bin/bin1.meta_lic bin/bin1.meta_lic restricted_allows_dynamic_linking",
- "bin/bin1.meta_lic lib/liba.so.meta_lic restricted_allows_dynamic_linking",
- "bin/bin1.meta_lic lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
+ "bin/bin1.meta_lic bin/bin1.meta_lic restricted_if_statically_linked",
+ "bin/bin1.meta_lic lib/liba.so.meta_lic restricted_if_statically_linked",
+ "bin/bin1.meta_lic lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
"bin/bin2.meta_lic bin/bin2.meta_lic restricted",
"bin/bin2.meta_lic lib/libb.so.meta_lic restricted",
- "highest.apex.meta_lic bin/bin1.meta_lic restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic bin/bin1.meta_lic restricted_if_statically_linked",
"highest.apex.meta_lic bin/bin2.meta_lic restricted",
- "highest.apex.meta_lic highest.apex.meta_lic restricted:restricted_allows_dynamic_linking",
- "highest.apex.meta_lic lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic highest.apex.meta_lic restricted:restricted_if_statically_linked",
+ "highest.apex.meta_lic lib/liba.so.meta_lic restricted_if_statically_linked",
"highest.apex.meta_lic lib/libb.so.meta_lic restricted",
- "highest.apex.meta_lic lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
- "lib/liba.so.meta_lic lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
+ "lib/liba.so.meta_lic lib/liba.so.meta_lic restricted_if_statically_linked",
"lib/libb.so.meta_lic lib/libb.so.meta_lic restricted",
},
},
@@ -624,18 +624,18 @@
stripPrefix: []string{"testdata/restricted/"},
},
expectedOut: []string{
- "bin/bin1.meta_lic bin/bin1.meta_lic restricted_allows_dynamic_linking",
- "bin/bin1.meta_lic lib/liba.so.meta_lic restricted_allows_dynamic_linking",
- "bin/bin1.meta_lic lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
+ "bin/bin1.meta_lic bin/bin1.meta_lic restricted_if_statically_linked",
+ "bin/bin1.meta_lic lib/liba.so.meta_lic restricted_if_statically_linked",
+ "bin/bin1.meta_lic lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
"bin/bin2.meta_lic bin/bin2.meta_lic restricted",
"bin/bin2.meta_lic lib/libb.so.meta_lic restricted",
- "highest.apex.meta_lic bin/bin1.meta_lic restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic bin/bin1.meta_lic restricted_if_statically_linked",
"highest.apex.meta_lic bin/bin2.meta_lic restricted",
- "highest.apex.meta_lic highest.apex.meta_lic restricted:restricted_allows_dynamic_linking",
- "highest.apex.meta_lic lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic highest.apex.meta_lic restricted:restricted_if_statically_linked",
+ "highest.apex.meta_lic lib/liba.so.meta_lic restricted_if_statically_linked",
"highest.apex.meta_lic lib/libb.so.meta_lic restricted",
- "highest.apex.meta_lic lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
- "lib/liba.so.meta_lic lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
+ "lib/liba.so.meta_lic lib/liba.so.meta_lic restricted_if_statically_linked",
"lib/libb.so.meta_lic lib/libb.so.meta_lic restricted",
},
},
@@ -645,18 +645,18 @@
roots: []string{"highest.apex.meta_lic"},
ctx: context{stripPrefix: []string{"testdata/restricted/"}, labelConditions: true},
expectedOut: []string{
- "bin/bin1.meta_lic:notice bin/bin1.meta_lic:notice notice:restricted_allows_dynamic_linking",
- "bin/bin1.meta_lic:notice lib/liba.so.meta_lic:restricted_allows_dynamic_linking restricted_allows_dynamic_linking",
- "bin/bin1.meta_lic:notice lib/libc.a.meta_lic:reciprocal reciprocal:restricted_allows_dynamic_linking",
+ "bin/bin1.meta_lic:notice bin/bin1.meta_lic:notice notice:restricted_if_statically_linked",
+ "bin/bin1.meta_lic:notice lib/liba.so.meta_lic:restricted_if_statically_linked restricted_if_statically_linked",
+ "bin/bin1.meta_lic:notice lib/libc.a.meta_lic:reciprocal reciprocal:restricted_if_statically_linked",
"bin/bin2.meta_lic:notice bin/bin2.meta_lic:notice notice:restricted",
"bin/bin2.meta_lic:notice lib/libb.so.meta_lic:restricted restricted",
- "highest.apex.meta_lic:notice bin/bin1.meta_lic:notice notice:restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic:notice bin/bin1.meta_lic:notice notice:restricted_if_statically_linked",
"highest.apex.meta_lic:notice bin/bin2.meta_lic:notice notice:restricted",
- "highest.apex.meta_lic:notice highest.apex.meta_lic:notice notice:restricted:restricted_allows_dynamic_linking",
- "highest.apex.meta_lic:notice lib/liba.so.meta_lic:restricted_allows_dynamic_linking restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic:notice highest.apex.meta_lic:notice notice:restricted:restricted_if_statically_linked",
+ "highest.apex.meta_lic:notice lib/liba.so.meta_lic:restricted_if_statically_linked restricted_if_statically_linked",
"highest.apex.meta_lic:notice lib/libb.so.meta_lic:restricted restricted",
- "highest.apex.meta_lic:notice lib/libc.a.meta_lic:reciprocal reciprocal:restricted_allows_dynamic_linking",
- "lib/liba.so.meta_lic:restricted_allows_dynamic_linking lib/liba.so.meta_lic:restricted_allows_dynamic_linking restricted_allows_dynamic_linking",
+ "highest.apex.meta_lic:notice lib/libc.a.meta_lic:reciprocal reciprocal:restricted_if_statically_linked",
+ "lib/liba.so.meta_lic:restricted_if_statically_linked lib/liba.so.meta_lic:restricted_if_statically_linked restricted_if_statically_linked",
"lib/libb.so.meta_lic:restricted lib/libb.so.meta_lic:restricted restricted",
},
},
@@ -665,18 +665,18 @@
name: "container",
roots: []string{"container.zip.meta_lic"},
expectedOut: []string{
- "testdata/restricted/bin/bin1.meta_lic testdata/restricted/bin/bin1.meta_lic notice:restricted_allows_dynamic_linking",
- "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",
- "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
+ "testdata/restricted/bin/bin1.meta_lic testdata/restricted/bin/bin1.meta_lic notice:restricted_if_statically_linked",
+ "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",
+ "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
"testdata/restricted/bin/bin2.meta_lic testdata/restricted/bin/bin2.meta_lic notice:restricted",
"testdata/restricted/bin/bin2.meta_lic testdata/restricted/lib/libb.so.meta_lic restricted",
- "testdata/restricted/container.zip.meta_lic testdata/restricted/bin/bin1.meta_lic notice:restricted_allows_dynamic_linking",
+ "testdata/restricted/container.zip.meta_lic testdata/restricted/bin/bin1.meta_lic notice:restricted_if_statically_linked",
"testdata/restricted/container.zip.meta_lic testdata/restricted/bin/bin2.meta_lic notice:restricted",
- "testdata/restricted/container.zip.meta_lic testdata/restricted/container.zip.meta_lic notice:restricted:restricted_allows_dynamic_linking",
- "testdata/restricted/container.zip.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "testdata/restricted/container.zip.meta_lic testdata/restricted/container.zip.meta_lic notice:restricted:restricted_if_statically_linked",
+ "testdata/restricted/container.zip.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",
"testdata/restricted/container.zip.meta_lic testdata/restricted/lib/libb.so.meta_lic restricted",
- "testdata/restricted/container.zip.meta_lic testdata/restricted/lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
- "testdata/restricted/lib/liba.so.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "testdata/restricted/container.zip.meta_lic testdata/restricted/lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
+ "testdata/restricted/lib/liba.so.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",
"testdata/restricted/lib/libb.so.meta_lic testdata/restricted/lib/libb.so.meta_lic restricted",
},
},
@@ -685,8 +685,8 @@
name: "application",
roots: []string{"application.meta_lic"},
expectedOut: []string{
- "testdata/restricted/application.meta_lic testdata/restricted/application.meta_lic notice:restricted:restricted_allows_dynamic_linking",
- "testdata/restricted/application.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted:restricted_allows_dynamic_linking",
+ "testdata/restricted/application.meta_lic testdata/restricted/application.meta_lic notice:restricted:restricted_if_statically_linked",
+ "testdata/restricted/application.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted:restricted_if_statically_linked",
},
},
{
@@ -694,9 +694,9 @@
name: "binary",
roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{
- "testdata/restricted/bin/bin1.meta_lic testdata/restricted/bin/bin1.meta_lic notice:restricted_allows_dynamic_linking",
- "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",
- "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/libc.a.meta_lic reciprocal:restricted_allows_dynamic_linking",
+ "testdata/restricted/bin/bin1.meta_lic testdata/restricted/bin/bin1.meta_lic notice:restricted_if_statically_linked",
+ "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",
+ "testdata/restricted/bin/bin1.meta_lic testdata/restricted/lib/libc.a.meta_lic reciprocal:restricted_if_statically_linked",
},
},
{
@@ -2235,17 +2235,17 @@
matchResolution(
"testdata/restricted/bin/bin1.meta_lic",
"testdata/restricted/bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"testdata/restricted/bin/bin1.meta_lic",
"testdata/restricted/lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/bin/bin1.meta_lic",
"testdata/restricted/lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/bin/bin2.meta_lic",
"testdata/restricted/bin/bin2.meta_lic",
@@ -2258,7 +2258,7 @@
matchResolution(
"testdata/restricted/highest.apex.meta_lic",
"testdata/restricted/bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"testdata/restricted/highest.apex.meta_lic",
@@ -2269,12 +2269,12 @@
"testdata/restricted/highest.apex.meta_lic",
"testdata/restricted/highest.apex.meta_lic",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"testdata/restricted/highest.apex.meta_lic",
"testdata/restricted/lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/highest.apex.meta_lic",
"testdata/restricted/lib/libb.so.meta_lic",
@@ -2283,11 +2283,11 @@
"testdata/restricted/highest.apex.meta_lic",
"testdata/restricted/lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/lib/liba.so.meta_lic",
"testdata/restricted/lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/lib/libb.so.meta_lic",
"testdata/restricted/lib/libb.so.meta_lic",
@@ -2309,17 +2309,17 @@
matchResolution(
"bin/bin1.meta_lic",
"bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"bin/bin1.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"bin/bin1.meta_lic",
"lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"bin/bin2.meta_lic",
"bin/bin2.meta_lic",
@@ -2332,7 +2332,7 @@
matchResolution(
"highest.apex.meta_lic",
"bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"highest.apex.meta_lic",
@@ -2343,12 +2343,12 @@
"highest.apex.meta_lic",
"highest.apex.meta_lic",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"highest.apex.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"highest.apex.meta_lic",
"lib/libb.so.meta_lic",
@@ -2357,11 +2357,11 @@
"highest.apex.meta_lic",
"lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"lib/liba.so.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"lib/libb.so.meta_lic",
"lib/libb.so.meta_lic",
@@ -2420,16 +2420,16 @@
matchResolution(
"bin/bin1.meta_lic",
"bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"bin/bin1.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"bin/bin1.meta_lic",
"lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"bin/bin2.meta_lic",
"bin/bin2.meta_lic",
@@ -2441,7 +2441,7 @@
matchResolution(
"highest.apex.meta_lic",
"bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"highest.apex.meta_lic",
"bin/bin2.meta_lic",
@@ -2450,11 +2450,11 @@
"highest.apex.meta_lic",
"highest.apex.meta_lic",
"restricted",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"highest.apex.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"highest.apex.meta_lic",
"lib/libb.so.meta_lic",
@@ -2463,11 +2463,11 @@
"highest.apex.meta_lic",
"lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"lib/liba.so.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"lib/libb.so.meta_lic",
"lib/libb.so.meta_lic",
@@ -2502,16 +2502,16 @@
matchResolution(
"bin/bin1.meta_lic",
"bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"bin/bin1.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"bin/bin1.meta_lic",
"lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"bin/bin2.meta_lic",
"bin/bin2.meta_lic",
@@ -2523,7 +2523,7 @@
matchResolution(
"highest.apex.meta_lic",
"bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"highest.apex.meta_lic",
"bin/bin2.meta_lic",
@@ -2532,11 +2532,11 @@
"highest.apex.meta_lic",
"highest.apex.meta_lic",
"restricted",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"highest.apex.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"highest.apex.meta_lic",
"lib/libb.so.meta_lic",
@@ -2545,11 +2545,11 @@
"highest.apex.meta_lic",
"lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"lib/liba.so.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"lib/libb.so.meta_lic",
"lib/libb.so.meta_lic",
@@ -2563,7 +2563,7 @@
ctx: context{stripPrefix: []string{"testdata/restricted/"}, labelConditions: true},
expectedOut: []getMatcher{
matchTarget("bin/bin1.meta_lic", "notice"),
- matchTarget("lib/liba.so.meta_lic", "restricted_allows_dynamic_linking"),
+ matchTarget("lib/liba.so.meta_lic", "restricted_if_statically_linked"),
matchTarget("lib/libc.a.meta_lic", "reciprocal"),
matchTarget("bin/bin2.meta_lic", "notice"),
matchTarget("lib/libb.so.meta_lic", "restricted"),
@@ -2571,17 +2571,17 @@
matchResolution(
"bin/bin1.meta_lic",
"bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"bin/bin1.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"bin/bin1.meta_lic",
"lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"bin/bin2.meta_lic",
"bin/bin2.meta_lic",
@@ -2594,7 +2594,7 @@
matchResolution(
"highest.apex.meta_lic",
"bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"highest.apex.meta_lic",
@@ -2605,12 +2605,12 @@
"highest.apex.meta_lic",
"highest.apex.meta_lic",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"highest.apex.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"highest.apex.meta_lic",
"lib/libb.so.meta_lic",
@@ -2619,11 +2619,11 @@
"highest.apex.meta_lic",
"lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"lib/liba.so.meta_lic",
"lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"lib/libb.so.meta_lic",
"lib/libb.so.meta_lic",
@@ -2644,17 +2644,17 @@
matchResolution(
"testdata/restricted/bin/bin1.meta_lic",
"testdata/restricted/bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"testdata/restricted/bin/bin1.meta_lic",
"testdata/restricted/lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/bin/bin1.meta_lic",
"testdata/restricted/lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/bin/bin2.meta_lic",
"testdata/restricted/bin/bin2.meta_lic",
@@ -2667,7 +2667,7 @@
matchResolution(
"testdata/restricted/container.zip.meta_lic",
"testdata/restricted/bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"testdata/restricted/container.zip.meta_lic",
@@ -2678,12 +2678,12 @@
"testdata/restricted/container.zip.meta_lic",
"testdata/restricted/container.zip.meta_lic",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"testdata/restricted/container.zip.meta_lic",
"testdata/restricted/lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/container.zip.meta_lic",
"testdata/restricted/lib/libb.so.meta_lic",
@@ -2692,11 +2692,11 @@
"testdata/restricted/container.zip.meta_lic",
"testdata/restricted/lib/libc.a.meta_lic",
"reciprocal",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/lib/liba.so.meta_lic",
"testdata/restricted/lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/lib/libb.so.meta_lic",
"testdata/restricted/lib/libb.so.meta_lic",
@@ -2714,12 +2714,12 @@
"testdata/restricted/application.meta_lic",
"testdata/restricted/application.meta_lic",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"testdata/restricted/application.meta_lic",
"testdata/restricted/lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"restricted"),
},
},
@@ -2734,16 +2734,16 @@
matchResolution(
"testdata/restricted/bin/bin1.meta_lic",
"testdata/restricted/bin/bin1.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"notice"),
matchResolution(
"testdata/restricted/bin/bin1.meta_lic",
"testdata/restricted/lib/liba.so.meta_lic",
- "restricted_allows_dynamic_linking"),
+ "restricted_if_statically_linked"),
matchResolution(
"testdata/restricted/bin/bin1.meta_lic",
"testdata/restricted/lib/libc.a.meta_lic",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"reciprocal"),
},
},
diff --git a/tools/compliance/cmd/listshare/listshare_test.go b/tools/compliance/cmd/listshare/listshare_test.go
index fb61583..16a8b69 100644
--- a/tools/compliance/cmd/listshare/listshare_test.go
+++ b/tools/compliance/cmd/listshare/listshare_test.go
@@ -187,7 +187,7 @@
},
{
project: "device/library",
- conditions: []string{"restricted_allows_dynamic_linking"},
+ conditions: []string{"restricted_if_statically_linked"},
},
{
project: "dynamic/binary",
@@ -196,14 +196,14 @@
{
project: "static/binary",
conditions: []string{
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
},
},
{
project: "static/library",
conditions: []string{
"reciprocal",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
},
},
},
@@ -219,7 +219,7 @@
},
{
project: "device/library",
- conditions: []string{"restricted_allows_dynamic_linking"},
+ conditions: []string{"restricted_if_statically_linked"},
},
{
project: "dynamic/binary",
@@ -228,14 +228,14 @@
{
project: "static/binary",
conditions: []string{
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
},
},
{
project: "static/library",
conditions: []string{
"reciprocal",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
},
},
},
@@ -249,14 +249,14 @@
project: "device/library",
conditions: []string{
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
},
},
{
project: "distributable/application",
conditions: []string{
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
},
},
},
@@ -269,20 +269,20 @@
{
project: "device/library",
conditions: []string{
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
},
},
{
project: "static/binary",
conditions: []string{
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
},
},
{
project: "static/library",
conditions: []string{
"reciprocal",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
},
},
},
diff --git a/tools/compliance/cmd/rtrace/rtrace_test.go b/tools/compliance/cmd/rtrace/rtrace_test.go
index cbe9461..d650868 100644
--- a/tools/compliance/cmd/rtrace/rtrace_test.go
+++ b/tools/compliance/cmd/rtrace/rtrace_test.go
@@ -44,9 +44,9 @@
expectedOut []string
}{
{
- condition: "firstparty",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "firstparty",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{},
},
{
@@ -60,33 +60,33 @@
expectedOut: []string{},
},
{
- condition: "firstparty",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "firstparty",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
expectedOut: []string{},
},
{
- condition: "firstparty",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "firstparty",
+ name: "application",
+ roots: []string{"application.meta_lic"},
expectedOut: []string{},
},
{
- condition: "firstparty",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "firstparty",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{},
},
{
- condition: "firstparty",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "firstparty",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{},
},
{
- condition: "notice",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "notice",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{},
},
{
@@ -100,33 +100,33 @@
expectedOut: []string{},
},
{
- condition: "notice",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "notice",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
expectedOut: []string{},
},
{
- condition: "notice",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "notice",
+ name: "application",
+ roots: []string{"application.meta_lic"},
expectedOut: []string{},
},
{
- condition: "notice",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "notice",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{},
},
{
- condition: "notice",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "notice",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{},
},
{
- condition: "reciprocal",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "reciprocal",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{},
},
{
@@ -140,27 +140,27 @@
expectedOut: []string{},
},
{
- condition: "reciprocal",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "reciprocal",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
expectedOut: []string{},
},
{
- condition: "reciprocal",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "reciprocal",
+ name: "application",
+ roots: []string{"application.meta_lic"},
expectedOut: []string{},
},
{
- condition: "reciprocal",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "reciprocal",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{},
},
{
- condition: "reciprocal",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "reciprocal",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{},
},
{
@@ -168,7 +168,7 @@
name: "apex",
roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{
- "testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",
"testdata/restricted/lib/libb.so.meta_lic restricted",
},
},
@@ -180,7 +180,7 @@
sources: []string{"testdata/restricted/bin/bin1.meta_lic"},
stripPrefix: []string{"testdata/restricted/"},
},
- expectedOut: []string{"lib/liba.so.meta_lic restricted_allows_dynamic_linking"},
+ expectedOut: []string{"lib/liba.so.meta_lic restricted_if_statically_linked"},
},
{
condition: "restricted",
@@ -197,32 +197,32 @@
name: "container",
roots: []string{"container.zip.meta_lic"},
expectedOut: []string{
- "testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",
+ "testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",
"testdata/restricted/lib/libb.so.meta_lic restricted",
},
},
{
- condition: "restricted",
- name: "application",
- roots: []string{"application.meta_lic"},
- expectedOut: []string{"testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking"},
+ condition: "restricted",
+ name: "application",
+ roots: []string{"application.meta_lic"},
+ expectedOut: []string{"testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked"},
},
{
- condition: "restricted",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
- expectedOut: []string{"testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking"},
+ condition: "restricted",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
+ expectedOut: []string{"testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked"},
},
{
- condition: "restricted",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "restricted",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{},
},
{
- condition: "proprietary",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "proprietary",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{"testdata/proprietary/lib/libb.so.meta_lic restricted"},
},
{
@@ -246,27 +246,27 @@
expectedOut: []string{"lib/libb.so.meta_lic restricted"},
},
{
- condition: "proprietary",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "proprietary",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
expectedOut: []string{"testdata/proprietary/lib/libb.so.meta_lic restricted"},
},
{
- condition: "proprietary",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "proprietary",
+ name: "application",
+ roots: []string{"application.meta_lic"},
expectedOut: []string{},
},
{
- condition: "proprietary",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "proprietary",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{},
},
{
- condition: "proprietary",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "proprietary",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{},
},
}
diff --git a/tools/compliance/cmd/testdata/proprietary/bin/bin3.meta_lic b/tools/compliance/cmd/testdata/proprietary/bin/bin3.meta_lic
index a7c3d01..859be7f 100644
--- a/tools/compliance/cmd/testdata/proprietary/bin/bin3.meta_lic
+++ b/tools/compliance/cmd/testdata/proprietary/bin/bin3.meta_lic
@@ -2,7 +2,7 @@
module_classes: "EXECUTABLES"
projects: "standalone/binary"
license_kinds: "SPDX-license-identifier-LGPL-2.0"
-license_conditions: "restricted_allows_dynamic_linking"
+license_conditions: "restricted_if_statically_linked"
license_texts: "testdata/restricted/RESTRICTED_LICENSE"
is_container: false
built: "out/target/product/fictional/obj/EXECUTABLES/bin_intermediates/bin3"
diff --git a/tools/compliance/cmd/testdata/restricted/bin/bin3.meta_lic b/tools/compliance/cmd/testdata/restricted/bin/bin3.meta_lic
index a7c3d01..859be7f 100644
--- a/tools/compliance/cmd/testdata/restricted/bin/bin3.meta_lic
+++ b/tools/compliance/cmd/testdata/restricted/bin/bin3.meta_lic
@@ -2,7 +2,7 @@
module_classes: "EXECUTABLES"
projects: "standalone/binary"
license_kinds: "SPDX-license-identifier-LGPL-2.0"
-license_conditions: "restricted_allows_dynamic_linking"
+license_conditions: "restricted_if_statically_linked"
license_texts: "testdata/restricted/RESTRICTED_LICENSE"
is_container: false
built: "out/target/product/fictional/obj/EXECUTABLES/bin_intermediates/bin3"
diff --git a/tools/compliance/cmd/testdata/restricted/lib/liba.so.meta_lic b/tools/compliance/cmd/testdata/restricted/lib/liba.so.meta_lic
index 101ca19..ce5de6e 100644
--- a/tools/compliance/cmd/testdata/restricted/lib/liba.so.meta_lic
+++ b/tools/compliance/cmd/testdata/restricted/lib/liba.so.meta_lic
@@ -1,7 +1,7 @@
package_name: "Device"
projects: "device/library"
license_kinds: "SPDX-license-identifier-LGPL-2.0"
-license_conditions: "restricted_allows_dynamic_linking"
+license_conditions: "restricted_if_statically_linked"
license_texts: "testdata/restricted/RESTRICTED_LICENSE"
is_container: false
built: "out/target/product/fictional/obj/SHARED_LIBRARIES/lib_intermediates/liba.so"
diff --git a/tools/compliance/condition.go b/tools/compliance/condition.go
index 3145249..2aac78c 100644
--- a/tools/compliance/condition.go
+++ b/tools/compliance/condition.go
@@ -58,15 +58,15 @@
var (
// RecognizedConditionNames maps condition strings to LicenseCondition.
RecognizedConditionNames = map[string]LicenseCondition{
- "unencumbered": UnencumberedCondition,
- "permissive": PermissiveCondition,
- "notice": NoticeCondition,
- "reciprocal": ReciprocalCondition,
- "restricted": RestrictedCondition,
- "restricted_allows_dynamic_linking": WeaklyRestrictedCondition,
- "proprietary": ProprietaryCondition,
- "by_exception_only": ByExceptionOnlyCondition,
- "not_allowed": NotAllowedCondition,
+ "unencumbered": UnencumberedCondition,
+ "permissive": PermissiveCondition,
+ "notice": NoticeCondition,
+ "reciprocal": ReciprocalCondition,
+ "restricted": RestrictedCondition,
+ "restricted_if_statically_linked": WeaklyRestrictedCondition,
+ "proprietary": ProprietaryCondition,
+ "by_exception_only": ByExceptionOnlyCondition,
+ "not_allowed": NotAllowedCondition,
}
)
@@ -84,7 +84,7 @@
case RestrictedCondition:
return "restricted"
case WeaklyRestrictedCondition:
- return "restricted_allows_dynamic_linking"
+ return "restricted_if_statically_linked"
case ProprietaryCondition:
return "proprietary"
case ByExceptionOnlyCondition:
diff --git a/tools/compliance/conditionset_test.go b/tools/compliance/conditionset_test.go
index 020cc0c..e31360d 100644
--- a/tools/compliance/conditionset_test.go
+++ b/tools/compliance/conditionset_test.go
@@ -96,18 +96,18 @@
{
name: "everything",
conditions: []string{"unencumbered", "permissive", "notice", "reciprocal", "restricted", "proprietary"},
- plus: &[]string{"restricted_allows_dynamic_linking", "by_exception_only", "not_allowed"},
+ plus: &[]string{"restricted_if_statically_linked", "by_exception_only", "not_allowed"},
matchingAny: map[string][]string{
- "unencumbered": []string{"unencumbered"},
- "permissive": []string{"permissive"},
- "notice": []string{"notice"},
- "reciprocal": []string{"reciprocal"},
- "restricted": []string{"restricted"},
- "restricted_allows_dynamic_linking": []string{"restricted_allows_dynamic_linking"},
- "proprietary": []string{"proprietary"},
- "by_exception_only": []string{"by_exception_only"},
- "not_allowed": []string{"not_allowed"},
- "notice|proprietary": []string{"notice", "proprietary"},
+ "unencumbered": []string{"unencumbered"},
+ "permissive": []string{"permissive"},
+ "notice": []string{"notice"},
+ "reciprocal": []string{"reciprocal"},
+ "restricted": []string{"restricted"},
+ "restricted_if_statically_linked": []string{"restricted_if_statically_linked"},
+ "proprietary": []string{"proprietary"},
+ "by_exception_only": []string{"by_exception_only"},
+ "not_allowed": []string{"not_allowed"},
+ "notice|proprietary": []string{"notice", "proprietary"},
},
expected: []string{
"unencumbered",
@@ -115,7 +115,7 @@
"notice",
"reciprocal",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"proprietary",
"by_exception_only",
"not_allowed",
@@ -129,7 +129,7 @@
"notice",
"reciprocal",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"proprietary",
"by_exception_only",
"not_allowed",
@@ -148,7 +148,7 @@
"notice",
"reciprocal",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"proprietary",
"by_exception_only",
"not_allowed",
@@ -157,18 +157,18 @@
{
name: "allbutone",
conditions: []string{"unencumbered", "permissive", "notice", "reciprocal", "restricted", "proprietary"},
- plus: &[]string{"restricted_allows_dynamic_linking", "by_exception_only", "not_allowed"},
+ plus: &[]string{"restricted_if_statically_linked", "by_exception_only", "not_allowed"},
matchingAny: map[string][]string{
- "unencumbered": []string{"unencumbered"},
- "permissive": []string{"permissive"},
- "notice": []string{"notice"},
- "reciprocal": []string{"reciprocal"},
- "restricted": []string{"restricted"},
- "restricted_allows_dynamic_linking": []string{"restricted_allows_dynamic_linking"},
- "proprietary": []string{"proprietary"},
- "by_exception_only": []string{"by_exception_only"},
- "not_allowed": []string{"not_allowed"},
- "notice|proprietary": []string{"notice", "proprietary"},
+ "unencumbered": []string{"unencumbered"},
+ "permissive": []string{"permissive"},
+ "notice": []string{"notice"},
+ "reciprocal": []string{"reciprocal"},
+ "restricted": []string{"restricted"},
+ "restricted_if_statically_linked": []string{"restricted_if_statically_linked"},
+ "proprietary": []string{"proprietary"},
+ "by_exception_only": []string{"by_exception_only"},
+ "not_allowed": []string{"not_allowed"},
+ "notice|proprietary": []string{"notice", "proprietary"},
},
expected: []string{
"unencumbered",
@@ -176,7 +176,7 @@
"notice",
"reciprocal",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"proprietary",
"by_exception_only",
"not_allowed",
@@ -190,23 +190,23 @@
"notice",
"reciprocal",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"proprietary",
"by_exception_only",
"not_allowed",
},
- minus: &[]string{"restricted_allows_dynamic_linking"},
+ minus: &[]string{"restricted_if_statically_linked"},
matchingAny: map[string][]string{
- "unencumbered": []string{"unencumbered"},
- "permissive": []string{"permissive"},
- "notice": []string{"notice"},
- "reciprocal": []string{"reciprocal"},
- "restricted": []string{"restricted"},
- "restricted_allows_dynamic_linking": []string{},
- "proprietary": []string{"proprietary"},
- "by_exception_only": []string{"by_exception_only"},
- "not_allowed": []string{"not_allowed"},
- "restricted|proprietary": []string{"restricted", "proprietary"},
+ "unencumbered": []string{"unencumbered"},
+ "permissive": []string{"permissive"},
+ "notice": []string{"notice"},
+ "reciprocal": []string{"reciprocal"},
+ "restricted": []string{"restricted"},
+ "restricted_if_statically_linked": []string{},
+ "proprietary": []string{"proprietary"},
+ "by_exception_only": []string{"by_exception_only"},
+ "not_allowed": []string{"not_allowed"},
+ "restricted|proprietary": []string{"restricted", "proprietary"},
},
expected: []string{
"unencumbered",
@@ -227,7 +227,7 @@
"notice",
"reciprocal",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"proprietary",
"by_exception_only",
"not_allowed",
@@ -238,41 +238,41 @@
"notice",
"reciprocal",
"restricted",
- "restricted_allows_dynamic_linking",
+ "restricted_if_statically_linked",
"proprietary",
"by_exception_only",
"not_allowed",
},
matchingAny: map[string][]string{
- "unencumbered": []string{},
- "permissive": []string{},
- "notice": []string{},
- "reciprocal": []string{},
- "restricted": []string{},
- "restricted_allows_dynamic_linking": []string{},
- "proprietary": []string{},
- "by_exception_only": []string{},
- "not_allowed": []string{},
- "restricted|proprietary": []string{},
+ "unencumbered": []string{},
+ "permissive": []string{},
+ "notice": []string{},
+ "reciprocal": []string{},
+ "restricted": []string{},
+ "restricted_if_statically_linked": []string{},
+ "proprietary": []string{},
+ "by_exception_only": []string{},
+ "not_allowed": []string{},
+ "restricted|proprietary": []string{},
},
expected: []string{},
},
{
name: "restrictedplus",
- conditions: []string{"restricted", "restricted_allows_dynamic_linking"},
+ conditions: []string{"restricted", "restricted_if_statically_linked"},
plus: &[]string{"permissive", "notice", "restricted", "proprietary"},
matchingAny: map[string][]string{
- "unencumbered": []string{},
- "permissive": []string{"permissive"},
- "notice": []string{"notice"},
- "restricted": []string{"restricted"},
- "restricted_allows_dynamic_linking": []string{"restricted_allows_dynamic_linking"},
- "proprietary": []string{"proprietary"},
- "restricted|proprietary": []string{"restricted", "proprietary"},
- "by_exception_only": []string{},
- "proprietary|by_exception_only": []string{"proprietary"},
+ "unencumbered": []string{},
+ "permissive": []string{"permissive"},
+ "notice": []string{"notice"},
+ "restricted": []string{"restricted"},
+ "restricted_if_statically_linked": []string{"restricted_if_statically_linked"},
+ "proprietary": []string{"proprietary"},
+ "restricted|proprietary": []string{"restricted", "proprietary"},
+ "by_exception_only": []string{},
+ "proprietary|by_exception_only": []string{"proprietary"},
},
- expected: []string{"permissive", "notice", "restricted", "restricted_allows_dynamic_linking", "proprietary"},
+ expected: []string{"permissive", "notice", "restricted", "restricted_if_statically_linked", "proprietary"},
},
}
for _, tt := range tests {
diff --git a/tools/compliance/policy_policy_test.go b/tools/compliance/policy_policy_test.go
index 6188eb2..f003314 100644
--- a/tools/compliance/policy_policy_test.go
+++ b/tools/compliance/policy_policy_test.go
@@ -49,8 +49,8 @@
name: "fponlgpl",
edge: annotated{"apacheBin.meta_lic", "lgplLib.meta_lic", []string{"static"}},
expectedDepActions: []string{
- "apacheBin.meta_lic:lgplLib.meta_lic:restricted_allows_dynamic_linking",
- "lgplLib.meta_lic:lgplLib.meta_lic:restricted_allows_dynamic_linking",
+ "apacheBin.meta_lic:lgplLib.meta_lic:restricted_if_statically_linked",
+ "lgplLib.meta_lic:lgplLib.meta_lic:restricted_if_statically_linked",
},
expectedTargetConditions: []string{},
},
@@ -85,15 +85,15 @@
expectedTargetConditions: []string{},
},
{
- name: "independentmodulestatic",
- edge: annotated{"apacheBin.meta_lic", "gplWithClasspathException.meta_lic", []string{"static"}},
- expectedDepActions: []string{},
+ name: "independentmodulestatic",
+ edge: annotated{"apacheBin.meta_lic", "gplWithClasspathException.meta_lic", []string{"static"}},
+ expectedDepActions: []string{},
expectedTargetConditions: []string{},
},
{
- name: "dependentmodule",
- edge: annotated{"dependentModule.meta_lic", "gplWithClasspathException.meta_lic", []string{"dynamic"}},
- expectedDepActions: []string{},
+ name: "dependentmodule",
+ edge: annotated{"dependentModule.meta_lic", "gplWithClasspathException.meta_lic", []string{"dynamic"}},
+ expectedDepActions: []string{},
expectedTargetConditions: []string{},
},
@@ -101,7 +101,7 @@
name: "lgplonfp",
edge: annotated{"lgplBin.meta_lic", "apacheLib.meta_lic", []string{"static"}},
expectedDepActions: []string{},
- expectedTargetConditions: []string{"lgplBin.meta_lic:restricted_allows_dynamic_linking"},
+ expectedTargetConditions: []string{"lgplBin.meta_lic:restricted_if_statically_linked"},
},
{
name: "lgplonfpdynamic",
diff --git a/tools/compliance/policy_resolve_test.go b/tools/compliance/policy_resolve_test.go
index d6731fe..f9ea6a1 100644
--- a/tools/compliance/policy_resolve_test.go
+++ b/tools/compliance/policy_resolve_test.go
@@ -204,8 +204,8 @@
{"apacheBin.meta_lic", "lgplLib.meta_lic", []string{"static"}},
},
expectedActions: []tcond{
- {"apacheBin.meta_lic", "notice|restricted_allows_dynamic_linking"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheBin.meta_lic", "notice|restricted_if_statically_linked"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -216,7 +216,7 @@
},
expectedActions: []tcond{
{"apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -227,9 +227,9 @@
{"apacheBin.meta_lic", "lgplLib.meta_lic", []string{"static"}},
},
expectedActions: []tcond{
- {"apacheContainer.meta_lic", "notice|restricted_allows_dynamic_linking"},
- {"apacheBin.meta_lic", "notice|restricted_allows_dynamic_linking"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheContainer.meta_lic", "notice|restricted_if_statically_linked"},
+ {"apacheBin.meta_lic", "notice|restricted_if_statically_linked"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -240,9 +240,9 @@
{"apacheContainer.meta_lic", "lgplLib.meta_lic", []string{"static"}},
},
expectedActions: []tcond{
- {"apacheContainer.meta_lic", "notice|restricted_allows_dynamic_linking"},
+ {"apacheContainer.meta_lic", "notice|restricted_if_statically_linked"},
{"apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -253,7 +253,7 @@
},
expectedActions: []tcond{
{"apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -266,7 +266,7 @@
expectedActions: []tcond{
{"apacheContainer.meta_lic", "notice"},
{"apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -279,7 +279,7 @@
expectedActions: []tcond{
{"apacheContainer.meta_lic", "notice"},
{"apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -500,9 +500,9 @@
{"apacheBin.meta_lic", "mitLib.meta_lic", []string{"static"}},
},
expectedActions: []tcond{
- {"apacheBin.meta_lic", "notice|restricted_allows_dynamic_linking"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
- {"mitLib.meta_lic", "notice|restricted_allows_dynamic_linking"},
+ {"apacheBin.meta_lic", "notice|restricted_if_statically_linked"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
+ {"mitLib.meta_lic", "notice|restricted_if_statically_linked"},
},
},
{
@@ -514,7 +514,7 @@
},
expectedActions: []tcond{
{"apacheBin.meta_lic", "notice"},
- {"lgplBin.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplBin.meta_lic", "restricted_if_statically_linked"},
{"mitLib.meta_lic", "notice"},
},
},
@@ -527,10 +527,10 @@
{"apacheBin.meta_lic", "mitLib.meta_lic", []string{"static"}},
},
expectedActions: []tcond{
- {"apacheContainer.meta_lic", "notice|restricted_allows_dynamic_linking"},
- {"apacheBin.meta_lic", "notice|restricted_allows_dynamic_linking"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
- {"mitLib.meta_lic", "notice|restricted_allows_dynamic_linking"},
+ {"apacheContainer.meta_lic", "notice|restricted_if_statically_linked"},
+ {"apacheBin.meta_lic", "notice|restricted_if_statically_linked"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
+ {"mitLib.meta_lic", "notice|restricted_if_statically_linked"},
},
},
{
@@ -541,9 +541,9 @@
{"apacheContainer.meta_lic", "lgplLib.meta_lic", []string{"static"}},
},
expectedActions: []tcond{
- {"apacheContainer.meta_lic", "notice|restricted_allows_dynamic_linking"},
+ {"apacheContainer.meta_lic", "notice|restricted_if_statically_linked"},
{"apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -555,7 +555,7 @@
},
expectedActions: []tcond{
{"apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
{"mitLib.meta_lic", "notice"},
},
},
@@ -569,7 +569,7 @@
expectedActions: []tcond{
{"apacheContainer.meta_lic", "notice"},
{"apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -582,7 +582,7 @@
expectedActions: []tcond{
{"apacheContainer.meta_lic", "notice"},
{"apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
diff --git a/tools/compliance/policy_resolvenotices_test.go b/tools/compliance/policy_resolvenotices_test.go
index 92b0ce3..b62d62f 100644
--- a/tools/compliance/policy_resolvenotices_test.go
+++ b/tools/compliance/policy_resolvenotices_test.go
@@ -217,10 +217,10 @@
},
expectedResolutions: []res{
{"apacheBin.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
- {"apacheBin.meta_lic", "apacheBin.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
- {"apacheBin.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheBin.meta_lic", "apacheBin.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
+ {"apacheBin.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
{"apacheBin.meta_lic", "mitLib.meta_lic", "mitLib.meta_lic", "notice"},
- {"apacheBin.meta_lic", "mitLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheBin.meta_lic", "mitLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -245,7 +245,7 @@
expectedResolutions: []res{
{"apacheBin.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
{"apacheBin.meta_lic", "mitLib.meta_lic", "mitLib.meta_lic", "notice"},
- {"lgplBin.meta_lic", "lgplBin.meta_lic", "lgplBin.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplBin.meta_lic", "lgplBin.meta_lic", "lgplBin.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -258,17 +258,17 @@
},
expectedResolutions: []res{
{"apacheContainer.meta_lic", "apacheContainer.meta_lic", "apacheContainer.meta_lic", "notice"},
- {"apacheContainer.meta_lic", "apacheContainer.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheContainer.meta_lic", "apacheContainer.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
{"apacheContainer.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
- {"apacheContainer.meta_lic", "apacheBin.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
- {"apacheContainer.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheContainer.meta_lic", "apacheBin.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
+ {"apacheContainer.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
{"apacheContainer.meta_lic", "mitLib.meta_lic", "mitLib.meta_lic", "notice"},
- {"apacheContainer.meta_lic", "mitLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheContainer.meta_lic", "mitLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
{"apacheBin.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
- {"apacheBin.meta_lic", "apacheBin.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
- {"apacheBin.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheBin.meta_lic", "apacheBin.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
+ {"apacheBin.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
{"apacheBin.meta_lic", "mitLib.meta_lic", "mitLib.meta_lic", "notice"},
- {"apacheBin.meta_lic", "mitLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheBin.meta_lic", "mitLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -280,11 +280,11 @@
},
expectedResolutions: []res{
{"apacheContainer.meta_lic", "apacheContainer.meta_lic", "apacheContainer.meta_lic", "notice"},
- {"apacheContainer.meta_lic", "apacheContainer.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheContainer.meta_lic", "apacheContainer.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
{"apacheContainer.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
- {"apacheContainer.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"apacheContainer.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
{"apacheBin.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -309,7 +309,7 @@
expectedResolutions: []res{
{"apacheBin.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
{"apacheBin.meta_lic", "mitLib.meta_lic", "mitLib.meta_lic", "notice"},
- {"lgplLib.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -336,7 +336,7 @@
{"apacheContainer.meta_lic", "apacheContainer.meta_lic", "apacheContainer.meta_lic", "notice"},
{"apacheContainer.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
{"apacheBin.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -363,7 +363,7 @@
{"apacheContainer.meta_lic", "apacheContainer.meta_lic", "apacheContainer.meta_lic", "notice"},
{"apacheContainer.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
{"apacheBin.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
- {"lgplLib.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplLib.meta_lic", "lgplLib.meta_lic", "lgplLib.meta_lic", "restricted_if_statically_linked"},
},
},
{
diff --git a/tools/compliance/policy_resolveshare_test.go b/tools/compliance/policy_resolveshare_test.go
index cf88058..faade88 100644
--- a/tools/compliance/policy_resolveshare_test.go
+++ b/tools/compliance/policy_resolveshare_test.go
@@ -73,8 +73,8 @@
{"lgplBin.meta_lic", "apacheLib.meta_lic", []string{"static"}},
},
expectedResolutions: []res{
- {"lgplBin.meta_lic", "lgplBin.meta_lic", "lgplBin.meta_lic", "restricted_allows_dynamic_linking"},
- {"lgplBin.meta_lic", "apacheLib.meta_lic", "lgplBin.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplBin.meta_lic", "lgplBin.meta_lic", "lgplBin.meta_lic", "restricted_if_statically_linked"},
+ {"lgplBin.meta_lic", "apacheLib.meta_lic", "lgplBin.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -84,7 +84,7 @@
{"lgplBin.meta_lic", "apacheLib.meta_lic", []string{"dynamic"}},
},
expectedResolutions: []res{
- {"lgplBin.meta_lic", "lgplBin.meta_lic", "lgplBin.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplBin.meta_lic", "lgplBin.meta_lic", "lgplBin.meta_lic", "restricted_if_statically_linked"},
},
},
{
@@ -94,7 +94,7 @@
{"lgplBin.meta_lic", "apacheLib.meta_lic", []string{"dynamic"}},
},
expectedResolutions: []res{
- {"lgplBin.meta_lic", "lgplBin.meta_lic", "lgplBin.meta_lic", "restricted_allows_dynamic_linking"},
+ {"lgplBin.meta_lic", "lgplBin.meta_lic", "lgplBin.meta_lic", "restricted_if_statically_linked"},
},
},
{
diff --git a/tools/compliance/test_util.go b/tools/compliance/test_util.go
index db711a7..f0242e2 100644
--- a/tools/compliance/test_util.go
+++ b/tools/compliance/test_util.go
@@ -57,7 +57,7 @@
LGPL = `` +
`package_name: "Free Library"
license_kinds: "SPDX-license-identifier-LGPL-2.0"
-license_conditions: "restricted_allows_dynamic_linking"
+license_conditions: "restricted_if_statically_linked"
`
// MPL starts a test metadata file for a module with MPL 2.0 reciprical licensing.
diff --git a/tools/releasetools/check_target_files_vintf.py b/tools/releasetools/check_target_files_vintf.py
index b32b85c..a254cab 100755
--- a/tools/releasetools/check_target_files_vintf.py
+++ b/tools/releasetools/check_target_files_vintf.py
@@ -129,8 +129,8 @@
dirmap = GetDirmap(input_tmp)
- apex_root, apex_info_file = PrepareApexDirectory(input_tmp)
- dirmap['/apex'] = apex_root
+ # Simulate apexd from target-files.
+ dirmap['/apex'] = PrepareApexDirectory(input_tmp)
args_for_skus = GetArgsForSkus(info_dict)
shipping_api_level_args = GetArgsForShippingApiLevel(info_dict)
@@ -140,7 +140,6 @@
'checkvintf',
'--check-compat',
]
- common_command += ['--apex-info-file', apex_info_file]
for device_path, real_path in sorted(dirmap.items()):
common_command += ['--dirmap', '{}:{}'.format(device_path, real_path)]
@@ -206,27 +205,29 @@
return patterns
def PrepareApexDirectory(inp):
- """ Prepare the APEX data.
+ """ Prepare /apex directory before running checkvintf
Apex binaries do not support dirmaps, in order to use these binaries we
need to move the APEXes from the extracted target file archives to the
expected device locations.
- The APEXes will also be extracted under the APEX/ directory
- matching what would be on the target.
+ This simulates how apexd activates APEXes.
+ 1. create {inp}/APEX which is treated as a "/" on device.
+ 2. copy apexes from target-files to {root}/{partition}/apex.
+ 3. mount apexes under {root}/{partition}/apex at {root}/apex.
+ 4. generate info files with dump_apex_info.
- Create the following structure under the input inp directory:
- APEX/apex # Extracted APEXes
- APEX/system/apex/ # System APEXes
- APEX/vendor/apex/ # Vendor APEXes
+ We'll get the following layout
+ {inp}/APEX/apex # Activated APEXes + some info files
+ {inp}/APEX/system/apex # System APEXes
+ {inp}/APEX/vendor/apex # Vendor APEXes
...
Args:
inp: path to the directory that contains the extracted target files archive.
Returns:
- extracted apex directory
- apex-info-list.xml file
+ directory representing /apex on device
"""
deapexer = 'deapexer'
@@ -273,15 +274,19 @@
root_dir_name = 'APEX'
root_dir = os.path.join(inp, root_dir_name)
extracted_root = os.path.join(root_dir, 'apex')
- apex_info_file = os.path.join(extracted_root, 'apex-info-list.xml')
- # Always create APEX directory for dirmap
+ # Always create /apex directory for dirmap
os.makedirs(extracted_root)
create_info_file = False
# Loop through search path looking for and processing apex/ directories.
for device_path, target_files_rel_paths in DIR_SEARCH_PATHS.items():
+ # checkvintf only needs vendor apexes. skip other partitions for efficiency
+ if device_path not in ['/vendor', '/odm']:
+ continue
+ # First, copy VENDOR/apex/foo.apex to APEX/vendor/apex/foo.apex
+ # Then, extract the contents to APEX/apex/foo/
for target_files_rel_path in target_files_rel_paths:
inp_partition = os.path.join(inp, target_files_rel_path,"apex")
if os.path.exists(inp_partition):
@@ -292,16 +297,11 @@
create_info_file = True
if create_info_file:
- ### Create apex-info-list.xml
- dump_cmd = ['dump_apex_info',
- '--root_dir', root_dir,
- '--out_file', apex_info_file]
+ ### Dump apex info files
+ dump_cmd = ['dump_apex_info', '--root_dir', root_dir]
common.RunAndCheckOutput(dump_cmd)
- if not os.path.exists(apex_info_file):
- raise RuntimeError('Failed to create apex info file %s', apex_info_file)
- logger.info('Created %s', apex_info_file)
- return extracted_root, apex_info_file
+ return extracted_root
def CheckVintfFromTargetFiles(inp, info_dict=None):
"""