Merge "Move comm(1) to toybox."
diff --git a/cc/test.go b/cc/test.go
index 96049db..f7180b5 100644
--- a/cc/test.go
+++ b/cc/test.go
@@ -16,7 +16,6 @@
import (
"path/filepath"
- "runtime"
"strings"
"android/soong/android"
@@ -377,16 +376,6 @@
}
func NewBenchmark(hod android.HostOrDeviceSupported) *Module {
- // Benchmarks aren't supported on Darwin
- if runtime.GOOS == "darwin" {
- switch hod {
- case android.HostAndDeviceSupported:
- hod = android.DeviceSupported
- case android.HostSupported:
- hod = android.NeitherHostNorDeviceSupported
- }
- }
-
module, binary := NewBinary(hod)
module.multilib = android.MultilibBoth
binary.baseInstaller = NewBaseInstaller("benchmarktest", "benchmarktest64", InstallInData)
diff --git a/java/aar.go b/java/aar.go
index a49aef0..99e9136 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -157,11 +157,9 @@
}
func (a *aapt) deps(ctx android.BottomUpMutatorContext, sdkContext sdkContext) {
- if !ctx.Config().UnbundledBuild() {
- sdkDep := decodeSdkDep(ctx, sdkContext)
- if sdkDep.frameworkResModule != "" {
- ctx.AddVariationDependencies(nil, frameworkResTag, sdkDep.frameworkResModule)
- }
+ sdkDep := decodeSdkDep(ctx, sdkContext)
+ if sdkDep.frameworkResModule != "" {
+ ctx.AddVariationDependencies(nil, frameworkResTag, sdkDep.frameworkResModule)
}
}