Merge "Export release flag types to make/soong" into main
diff --git a/cmd/release_config/release_config_lib/util.go b/cmd/release_config/release_config_lib/util.go
index 040820b..6190b44 100644
--- a/cmd/release_config/release_config_lib/util.go
+++ b/cmd/release_config/release_config_lib/util.go
@@ -216,6 +216,7 @@
var stdout strings.Builder
getBuildVar.Stdin = strings.NewReader("")
getBuildVar.Stdout = &stdout
+ getBuildVar.Stderr = os.Stderr
err = getBuildVar.Run()
if err != nil {
return
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 645f513..8c91288 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -1504,6 +1504,12 @@
var implLibraryTag = sdkLibraryComponentTag{name: "impl-library"}
+var _ android.InstallNeededDependencyTag = sdkLibraryComponentTag{}
+
+func (t sdkLibraryComponentTag) InstallDepNeeded() bool {
+ return t.name == "xml-permissions-file" || t.name == "impl-library"
+}
+
// Add the dependencies on the child modules in the component deps mutator.
func (module *SdkLibrary) ComponentDepsMutator(ctx android.BottomUpMutatorContext) {
for _, apiScope := range module.getGeneratedApiScopes(ctx) {