diff options
| author | 2024-12-17 10:42:42 -0800 | |
|---|---|---|
| committer | 2024-12-17 10:42:42 -0800 | |
| commit | 6b7075f19fd4efa290179e894ae942e16ac9f699 (patch) | |
| tree | dec563ce7eb60b0dbeb9913609181c596c70ac6d /java/rro_test.go | |
| parent | 85289cfc214bbd75feb976dcf87986a0a28415c0 (diff) | |
Always install to out/target instead of out/soong/target
So that when using soong-only builds, we don't have to update
a bunch of tools and other parts of soong that expect files in
out/target.
Bug: 383892968
Test: m nothing --no-skip-soong-tests
Change-Id: Idba3b5a416e6ffff799ec3ce632a8a4fbafe341f
Diffstat (limited to 'java/rro_test.go')
| -rw-r--r-- | java/rro_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/rro_test.go b/java/rro_test.go index 4d58bb498..b94651137 100644 --- a/java/rro_test.go +++ b/java/rro_test.go @@ -216,7 +216,7 @@ func TestOverrideRuntimeResourceOverlay(t *testing.T) { }{ { variantName: "android_common", - apkPath: "out/soong/target/product/test_device/product/overlay/foo_overlay.apk", + apkPath: "out/target/product/test_device/product/overlay/foo_overlay.apk", overrides: nil, targetVariant: "android_common", packageFlag: "", @@ -224,7 +224,7 @@ func TestOverrideRuntimeResourceOverlay(t *testing.T) { }, { variantName: "android_common_bar_overlay", - apkPath: "out/soong/target/product/test_device/product/overlay/bar_overlay.apk", + apkPath: "out/target/product/test_device/product/overlay/bar_overlay.apk", overrides: []string{"foo_overlay"}, targetVariant: "android_common_bar", packageFlag: "com.android.bar.overlay", @@ -283,23 +283,23 @@ func TestRuntimeResourceOverlayPartition(t *testing.T) { }{ { name: "device_specific", - expectedPath: "out/soong/target/product/test_device/odm/overlay", + expectedPath: "out/target/product/test_device/odm/overlay", }, { name: "soc_specific", - expectedPath: "out/soong/target/product/test_device/vendor/overlay", + expectedPath: "out/target/product/test_device/vendor/overlay", }, { name: "system_ext_specific", - expectedPath: "out/soong/target/product/test_device/system_ext/overlay", + expectedPath: "out/target/product/test_device/system_ext/overlay", }, { name: "product_specific", - expectedPath: "out/soong/target/product/test_device/product/overlay", + expectedPath: "out/target/product/test_device/product/overlay", }, { name: "default", - expectedPath: "out/soong/target/product/test_device/product/overlay", + expectedPath: "out/target/product/test_device/product/overlay", }, } for _, testCase := range testCases { |