Introduce aconfig_declarations property in udc-mainline-prod
Currently, Soong changes in aosp are not merged to udc-mainline-prod, while the mainline projects changes from aosp are merged. This leads to a conflicting build configuration issue for aosp-first projects, which want to maintain consistent bp module definition between aosp and main. In order to support specifying `aconfig_declaration` property in aosp for mainline projects, this change adds the property to the module definition while not performing any build actions, in order to resolve presubmit failures in udc-mainline-prod when specifying the property in aosp changes. Cherry-picking the aosp changes that introduces the property is not an option, as the flagging infra is not expected to be imported to udc-mainline-prod. Test: m nothing --no-skip-soong-tests Bug: 315027929 Merged-In: I37becd1b9dd9069d7ac4abed130906df30b3fdf4 Change-Id: Ie467c1dd4a36774f6268452fae8c054b9b3ad7d9
This commit is contained in:
@@ -152,6 +152,10 @@ type DroidstubsProperties struct {
|
||||
// API surface of this module. If set, the module contributes to an API surface.
|
||||
// For the full list of available API surfaces, refer to soong/android/sdk_version.go
|
||||
Api_surface *string
|
||||
|
||||
// a list of aconfig_declarations module names that the stubs generated in this module
|
||||
// depend on.
|
||||
Aconfig_declarations []string
|
||||
}
|
||||
|
||||
// Used by xsd_config
|
||||
|
@@ -571,6 +571,10 @@ type sdkLibraryProperties struct {
|
||||
Enabled *bool
|
||||
}
|
||||
|
||||
// a list of aconfig_declarations module names that the stubs generated in this module
|
||||
// depend on.
|
||||
Aconfig_declarations []string
|
||||
|
||||
// TODO: determines whether to create HTML doc or not
|
||||
// Html_doc *bool
|
||||
}
|
||||
|
Reference in New Issue
Block a user