diff options
| -rw-r--r-- | android/variable.go | 6 | ||||
| -rw-r--r-- | cc/vndk.go | 27 | ||||
| -rw-r--r-- | java/sdk_library.go | 4 |
3 files changed, 16 insertions, 21 deletions
diff --git a/android/variable.go b/android/variable.go index 41943b0f9..abbdf21bd 100644 --- a/android/variable.go +++ b/android/variable.go @@ -119,6 +119,10 @@ type variableProperties struct { Flatten_apex struct { Enabled *bool } + + Experimental_mte struct { + Cflags []string `android:"arch_variant"` + } `android:"arch_variant"` } `android:"arch_variant"` } @@ -228,6 +232,8 @@ type productVariables struct { EnableXOM *bool `json:",omitempty"` XOMExcludePaths []string `json:",omitempty"` + Experimental_mte *bool `json:",omitempty"` + VendorPath *string `json:",omitempty"` OdmPath *string `json:",omitempty"` ProductPath *string `json:",omitempty"` diff --git a/cc/vndk.go b/cc/vndk.go index f39ee5024..d6c2f6ff9 100644 --- a/cc/vndk.go +++ b/cc/vndk.go @@ -194,16 +194,15 @@ func vndkIsVndkDepAllowed(from *vndkdep, to *vndkdep) error { } var ( - vndkCoreLibrariesKey = android.NewOnceKey("vndkCoreLibrarires") - vndkSpLibrariesKey = android.NewOnceKey("vndkSpLibrarires") - llndkLibrariesKey = android.NewOnceKey("llndkLibrarires") - vndkPrivateLibrariesKey = android.NewOnceKey("vndkPrivateLibrarires") - vndkUsingCoreVariantLibrariesKey = android.NewOnceKey("vndkUsingCoreVariantLibrarires") - modulePathsKey = android.NewOnceKey("modulePaths") - vndkSnapshotOutputsKey = android.NewOnceKey("vndkSnapshotOutputs") - vndkMustUseVendorVariantListKey = android.NewOnceKey("vndkMustUseVendorVariantListKey") - testVndkMustUseVendorVariantListKey = android.NewOnceKey("testVndkMustUseVendorVariantListKey") - vndkLibrariesLock sync.Mutex + vndkCoreLibrariesKey = android.NewOnceKey("vndkCoreLibrarires") + vndkSpLibrariesKey = android.NewOnceKey("vndkSpLibrarires") + llndkLibrariesKey = android.NewOnceKey("llndkLibrarires") + vndkPrivateLibrariesKey = android.NewOnceKey("vndkPrivateLibrarires") + vndkUsingCoreVariantLibrariesKey = android.NewOnceKey("vndkUsingCoreVariantLibrarires") + modulePathsKey = android.NewOnceKey("modulePaths") + vndkSnapshotOutputsKey = android.NewOnceKey("vndkSnapshotOutputs") + vndkMustUseVendorVariantListKey = android.NewOnceKey("vndkMustUseVendorVariantListKey") + vndkLibrariesLock sync.Mutex headerExts = []string{".h", ".hh", ".hpp", ".hxx", ".h++", ".inl", ".inc", ".ipp", ".h.generic"} ) @@ -262,12 +261,6 @@ func vndkSnapshotOutputs(config android.Config) *android.RuleBuilderInstalls { func vndkMustUseVendorVariantList(cfg android.Config) []string { return cfg.Once(vndkMustUseVendorVariantListKey, func() interface{} { - override := cfg.Once(testVndkMustUseVendorVariantListKey, func() interface{} { - return []string(nil) - }).([]string) - if override != nil { - return override - } return config.VndkMustUseVendorVariantList }).([]string) } @@ -275,7 +268,7 @@ func vndkMustUseVendorVariantList(cfg android.Config) []string { // test may call this to override global configuration(config.VndkMustUseVendorVariantList) // when it is called, it must be before the first call to vndkMustUseVendorVariantList() func setVndkMustUseVendorVariantListForTest(config android.Config, mustUseVendorVariantList []string) { - config.Once(testVndkMustUseVendorVariantListKey, func() interface{} { + config.Once(vndkMustUseVendorVariantListKey, func() interface{} { return mustUseVendorVariantList }) } diff --git a/java/sdk_library.go b/java/sdk_library.go index 476e5491b..b7efcff35 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -79,9 +79,6 @@ func init() { } type sdkLibraryProperties struct { - // list of optional source files that are part of API but not part of runtime library. - Api_srcs []string `android:"arch_variant"` - // List of Java libraries that will be in the classpath when building stubs Stub_only_libs []string `android:"arch_variant"` @@ -461,7 +458,6 @@ func (module *SdkLibrary) createDocs(mctx android.LoadHookContext, apiScope apiS props.Name = proptools.StringPtr(module.docsName(apiScope)) props.Srcs = append(props.Srcs, module.Library.Module.properties.Srcs...) - props.Srcs = append(props.Srcs, module.sdkLibraryProperties.Api_srcs...) props.Sdk_version = proptools.StringPtr(sdkVersion) props.Installable = proptools.BoolPtr(false) // A droiddoc module has only one Libs property and doesn't distinguish between |