aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-09 06:11:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-09 06:11:15 +0000
commitccf622876faa9d878c4333ae4734929ce91be22c (patch)
tree1c48963f7b2e739a97c834fcbbdb1cc45e744b6b
parent7da9a5f2c99be7507fd0f479a7997a58a1049f5d (diff)
parentb164f51f549e4460a1a67d7a1de92cbdb9387401 (diff)
downloadplatform_system_tools_hidl-ccf622876faa9d878c4333ae4734929ce91be22c.tar.gz
platform_system_tools_hidl-ccf622876faa9d878c4333ae4734929ce91be22c.tar.bz2
platform_system_tools_hidl-ccf622876faa9d878c4333ae4734929ce91be22c.zip
Merge "Move hidl_package_root props to a named struct for the props to be captured in Soong docs" am: b164f51f54
Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/1421654 Change-Id: I77ef1f9f23937bf0a2ee409785d3c318619fd9b4
-rw-r--r--build/hidl_package_root.go28
1 files changed, 15 insertions, 13 deletions
diff --git a/build/hidl_package_root.go b/build/hidl_package_root.go
index f3ffc1ef4..fc58597dd 100644
--- a/build/hidl_package_root.go
+++ b/build/hidl_package_root.go
@@ -30,6 +30,20 @@ var (
}, "output")
)
+type hidlPackageRootProperties struct {
+ // Path to the package root from android build root. It is recommended not to set this and
+ // use the current path. This will be deprecated in the future.
+ Path *string
+
+ // True to require a current.txt API file here.
+ //
+ // When false, it uses the file only when it exists.
+ Use_current *bool
+
+ // True to require all things referenced by this package root to be frozen.
+ Require_frozen *bool
+}
+
func init() {
android.RegisterModuleType("hidl_package_root", hidlPackageRootFactory)
}
@@ -37,19 +51,7 @@ func init() {
type hidlPackageRoot struct {
android.ModuleBase
- properties struct {
- // Path to the package root from android build root. It is recommended not to set this and
- // use the current path. This will be deprecated in the future.
- Path *string
-
- // True to require a current.txt API file here.
- //
- // When false, it uses the file only when it exists.
- Use_current *bool
-
- // True to require all things referenced by this package root to be frozen.
- Require_frozen *bool
- }
+ properties hidlPackageRootProperties
currentPath android.OptionalPath
genOutputs android.Paths