Move policy subdirectory into package directory
Go's tooling expects that all files in the same package are in the
same directory. Move the policy/*.go files to policy_*.go.
Test: go test ./...
Change-Id: I7e81936ddd20a5ffb4770ae23bdb6e411d6924cc
diff --git a/tools/compliance/Android.bp b/tools/compliance/Android.bp
index 8bae317..7d0fb90 100644
--- a/tools/compliance/Android.bp
+++ b/tools/compliance/Android.bp
@@ -81,14 +81,14 @@
"doc.go",
"graph.go",
"noticeindex.go",
- "policy/policy.go",
- "policy/resolve.go",
- "policy/resolvenotices.go",
- "policy/resolveshare.go",
- "policy/resolveprivacy.go",
- "policy/shareprivacyconflicts.go",
- "policy/shipped.go",
- "policy/walk.go",
+ "policy_policy.go",
+ "policy_resolve.go",
+ "policy_resolvenotices.go",
+ "policy_resolveshare.go",
+ "policy_resolveprivacy.go",
+ "policy_shareprivacyconflicts.go",
+ "policy_shipped.go",
+ "policy_walk.go",
"readgraph.go",
"resolution.go",
"resolutionset.go",
@@ -97,14 +97,14 @@
"condition_test.go",
"conditionset_test.go",
"readgraph_test.go",
- "policy/policy_test.go",
- "policy/resolve_test.go",
- "policy/resolvenotices_test.go",
- "policy/resolveshare_test.go",
- "policy/resolveprivacy_test.go",
- "policy/shareprivacyconflicts_test.go",
- "policy/shipped_test.go",
- "policy/walk_test.go",
+ "policy_policy_test.go",
+ "policy_resolve_test.go",
+ "policy_resolvenotices_test.go",
+ "policy_resolveshare_test.go",
+ "policy_resolveprivacy_test.go",
+ "policy_shareprivacyconflicts_test.go",
+ "policy_shipped_test.go",
+ "policy_walk_test.go",
"resolutionset_test.go",
"test_util.go",
],
diff --git a/tools/compliance/policy/policy.go b/tools/compliance/policy_policy.go
similarity index 100%
rename from tools/compliance/policy/policy.go
rename to tools/compliance/policy_policy.go
diff --git a/tools/compliance/policy/policy_test.go b/tools/compliance/policy_policy_test.go
similarity index 100%
rename from tools/compliance/policy/policy_test.go
rename to tools/compliance/policy_policy_test.go
diff --git a/tools/compliance/policy/resolve.go b/tools/compliance/policy_resolve.go
similarity index 100%
rename from tools/compliance/policy/resolve.go
rename to tools/compliance/policy_resolve.go
diff --git a/tools/compliance/policy/resolve_test.go b/tools/compliance/policy_resolve_test.go
similarity index 100%
rename from tools/compliance/policy/resolve_test.go
rename to tools/compliance/policy_resolve_test.go
diff --git a/tools/compliance/policy/resolvenotices.go b/tools/compliance/policy_resolvenotices.go
similarity index 100%
rename from tools/compliance/policy/resolvenotices.go
rename to tools/compliance/policy_resolvenotices.go
diff --git a/tools/compliance/policy/resolvenotices_test.go b/tools/compliance/policy_resolvenotices_test.go
similarity index 100%
rename from tools/compliance/policy/resolvenotices_test.go
rename to tools/compliance/policy_resolvenotices_test.go
diff --git a/tools/compliance/policy/resolveprivacy.go b/tools/compliance/policy_resolveprivacy.go
similarity index 100%
rename from tools/compliance/policy/resolveprivacy.go
rename to tools/compliance/policy_resolveprivacy.go
diff --git a/tools/compliance/policy/resolveprivacy_test.go b/tools/compliance/policy_resolveprivacy_test.go
similarity index 100%
rename from tools/compliance/policy/resolveprivacy_test.go
rename to tools/compliance/policy_resolveprivacy_test.go
diff --git a/tools/compliance/policy/resolveshare.go b/tools/compliance/policy_resolveshare.go
similarity index 100%
rename from tools/compliance/policy/resolveshare.go
rename to tools/compliance/policy_resolveshare.go
diff --git a/tools/compliance/policy/resolveshare_test.go b/tools/compliance/policy_resolveshare_test.go
similarity index 100%
rename from tools/compliance/policy/resolveshare_test.go
rename to tools/compliance/policy_resolveshare_test.go
diff --git a/tools/compliance/policy/shareprivacyconflicts.go b/tools/compliance/policy_shareprivacyconflicts.go
similarity index 100%
rename from tools/compliance/policy/shareprivacyconflicts.go
rename to tools/compliance/policy_shareprivacyconflicts.go
diff --git a/tools/compliance/policy/shareprivacyconflicts_test.go b/tools/compliance/policy_shareprivacyconflicts_test.go
similarity index 100%
rename from tools/compliance/policy/shareprivacyconflicts_test.go
rename to tools/compliance/policy_shareprivacyconflicts_test.go
diff --git a/tools/compliance/policy/shipped.go b/tools/compliance/policy_shipped.go
similarity index 100%
rename from tools/compliance/policy/shipped.go
rename to tools/compliance/policy_shipped.go
diff --git a/tools/compliance/policy/shipped_test.go b/tools/compliance/policy_shipped_test.go
similarity index 100%
rename from tools/compliance/policy/shipped_test.go
rename to tools/compliance/policy_shipped_test.go
diff --git a/tools/compliance/policy/walk.go b/tools/compliance/policy_walk.go
similarity index 100%
rename from tools/compliance/policy/walk.go
rename to tools/compliance/policy_walk.go
diff --git a/tools/compliance/policy/walk_test.go b/tools/compliance/policy_walk_test.go
similarity index 100%
rename from tools/compliance/policy/walk_test.go
rename to tools/compliance/policy_walk_test.go