Merge "Regression testcase for shipped vs nonshipped."
diff --git a/core/Makefile b/core/Makefile
index 030b3fe..d420c29 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2117,6 +2117,9 @@
ifdef TARGET_RECOVERY_FSTAB
recovery_fstab := $(TARGET_RECOVERY_FSTAB)
+else ifdef TARGET_RECOVERY_FSTAB_GENRULE
+# Specifies a soong genrule module that generates an fstab.
+recovery_fstab := $(call intermediates-dir-for,ETC,$(TARGET_RECOVERY_FSTAB_GENRULE))/$(TARGET_RECOVERY_FSTAB_GENRULE)
else
recovery_fstab := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery.fstab))
endif
diff --git a/target/product/OWNERS b/target/product/OWNERS
index 82e6e88..b3d8998 100644
--- a/target/product/OWNERS
+++ b/target/product/OWNERS
@@ -2,4 +2,4 @@
# GSI
per-file gsi_release.mk = file:/target/product/gsi/OWNERS
-per-file gsi_keys.mk = file:/target/product/gsi/OWNERS
+per-file developer_gsi_keys.mk = file:/target/product/gsi/OWNERS
diff --git a/tools/compliance/cmd/testdata/README.md b/tools/compliance/cmd/testdata/README.md
index 44d687c..07564c2 100644
--- a/tools/compliance/cmd/testdata/README.md
+++ b/tools/compliance/cmd/testdata/README.md
@@ -73,6 +73,7 @@
#### a pure aggregation `container.zip` that merely bundles files together
+```dot
strict digraph {
rankdir=LR;
bin1 [label="bin/bin1.meta_lic"];
@@ -92,6 +93,7 @@
container -> libb [label="static"];
{rank=same; container}
}
+```
#### an apex file (more like an apk file) with some binaries and libraries