Fix install location for vendor tests
These should be install in /data/nativetest* with the rest of the tests,
but had been moved to /vendor/nativetest* accidentally. Add some tests
so that this doesn't happen again.
Bug: 63393698
Test: m -j blueprint_tools
Test: compare out/soong/Android-aosp_arm64.mk
Test: compare out/soong/build.ninja
Change-Id: Id3b08a7e3908955df18a043a02ea576dc88086c3
diff --git a/android/config.go b/android/config.go
index 1f29d94..dbb9fa4 100644
--- a/android/config.go
+++ b/android/config.go
@@ -88,8 +88,7 @@
}
type deviceConfig struct {
- config *config
- targets []Arch
+ config *config
OncePer
}
@@ -167,9 +166,18 @@
// TestConfig returns a Config object suitable for using for tests
func TestConfig(buildDir string) Config {
- return Config{&config{
+ config := &config{
+ ProductVariables: productVariables{
+ DeviceName: stringPtr("test_device"),
+ },
+
buildDir: buildDir,
- }}
+ }
+ config.deviceConfig = &deviceConfig{
+ config: config,
+ }
+
+ return Config{config}
}
// New creates a new Config object. The srcDir argument specifies the path to
@@ -182,16 +190,12 @@
srcDir: srcDir,
buildDir: buildDir,
-
- deviceConfig: &deviceConfig{},
}
- deviceConfig := &deviceConfig{
+ config.deviceConfig = &deviceConfig{
config: config,
}
- config.deviceConfig = deviceConfig
-
// Sanity check the build and source directories. This won't catch strange
// configurations with symlinks, but at least checks the obvious cases.
absBuildDir, err := filepath.Abs(buildDir)