Merge changes from topic "prebuilt-hiddenapi"
* changes: Supply LOCAL_SOONG_DEX_JAR for java_import with compile_dex. Enable an apex to include a java_import. Enable prebuilt hiddenapi CSV files.
This commit is contained in:
@@ -1026,6 +1026,10 @@ func (c *config) HasMultilibConflict(arch ArchType) bool {
|
||||
return c.multilibConflicts[arch]
|
||||
}
|
||||
|
||||
func (c *config) PrebuiltHiddenApiDir(ctx PathContext) string {
|
||||
return String(c.productVariables.PrebuiltHiddenApiDir)
|
||||
}
|
||||
|
||||
func (c *deviceConfig) Arches() []Arch {
|
||||
var arches []Arch
|
||||
for _, target := range c.config.Targets[Android] {
|
||||
|
Reference in New Issue
Block a user