StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix problems with TestPrebuiltExportDexImplementationJars" am: 24907d115a am: fba1b458a0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560276

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2c15bb6f1127acee593404029c24fd6af993db8
This commit is contained in:
Paul Duffin
2021-01-26 18:42:08 +00:00
committed by Automerger Merge Worker
parent 985c087f4c fba1b458a0
commit 9ef42fd746
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/apex_test.go
View File

@@ -4213,9 +4213,11 @@ func TestPrebuiltOverrides(t *testing.T) {
} }
} }
// These tests verify that the prebuilt_apex/deapexer to java_import wiring allows for the
// propagation of paths to dex implementation jars from the former to the latter.
func TestPrebuiltExportDexImplementationJars(t *testing.T) { func TestPrebuiltExportDexImplementationJars(t *testing.T) {
transform := func(config *dexpreopt.GlobalConfig) { transform := func(config *dexpreopt.GlobalConfig) {
config.BootJars = android.CreateTestConfiguredJarList([]string{"myapex:libfoo"}) // Empty transformation.
} }
checkDexJarBuildPath := func(ctx *android.TestContext, name string) { checkDexJarBuildPath := func(ctx *android.TestContext, name string) {
@@ -4298,7 +4300,6 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
bp := ` bp := `
prebuilt_apex { prebuilt_apex {
name: "myapex", name: "myapex",
prefer: true,
arch: { arch: {
arm64: { arm64: {
src: "myapex-arm64.apex", src: "myapex-arm64.apex",
@@ -4312,6 +4313,7 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
java_import { java_import {
name: "libfoo", name: "libfoo",
prefer: true,
jars: ["libfoo.jar"], jars: ["libfoo.jar"],
} }