diff options
author | Colin Cross <ccross@android.com> | 2018-11-12 10:13:39 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2018-12-15 19:07:54 -0800 |
commit | 43f08db29e874ec5f5eb56de6972ef7ed0321809 (patch) | |
tree | 172846f9da39b8c54157d8ec77d4dfc5363ac681 /android/paths_test.go | |
parent | df76efe5244766fed2940a80003de9b772005bc1 (diff) | |
download | build_soong-43f08db29e874ec5f5eb56de6972ef7ed0321809.tar.gz build_soong-43f08db29e874ec5f5eb56de6972ef7ed0321809.tar.bz2 build_soong-43f08db29e874ec5f5eb56de6972ef7ed0321809.zip |
Dexpreopt soong modules inside soong
Port the dexpreopt logic from Make to the dexpreopt package in Soong,
and use it to dexpreopt Soong modules. The same package is also
compiled into the dexpreopt_gen binary to generate dexpreopt scripts
for Make modules.
This relands Ib67e2febf9ed921f06e8a86b9ec945c80dff35eb and
I462182638bd57b1367b5bfb0718e975c11ae66f7, along with multiple fixes
to depsfile generation in dexpreopt_gen that caused .odex files for
modules in defined make to be missing dependencies on boot.art, and
a fix to not dexpreopt and strip tests.
Bug: 119412419
Bug: 120273280
Test: no differences to dexpreopt outputs on aosp_sailfish system/,
only expected changes to dexpreopt outputs on system_other
(.vdex files for privileged Soong modules no longer incorrectly
contain .dex contents).
Test: OUT_DIR=$PWD/out m
Test: NINJA_ARGS="-t deps out/target/product/sailfish/obj/APPS/Contacts_intermediates/dexpreopt.zip" m
Change-Id: I6bb2c971cee65d2338839753aa0d84939f335b1b
Diffstat (limited to 'android/paths_test.go')
-rw-r--r-- | android/paths_test.go | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/android/paths_test.go b/android/paths_test.go index fbeccb1c..c4332d26 100644 --- a/android/paths_test.go +++ b/android/paths_test.go @@ -573,3 +573,60 @@ func TestDirectorySortedPaths(t *testing.T) { t.Errorf("FilesInDirectory(b):\n %#v\n != \n %#v", inA.Strings(), expectedA) } } + +func TestMaybeRel(t *testing.T) { + testCases := []struct { + name string + base string + target string + out string + isRel bool + }{ + { + name: "normal", + base: "a/b/c", + target: "a/b/c/d", + out: "d", + isRel: true, + }, + { + name: "parent", + base: "a/b/c/d", + target: "a/b/c", + isRel: false, + }, + { + name: "not relative", + base: "a/b", + target: "c/d", + isRel: false, + }, + { + name: "abs1", + base: "/a", + target: "a", + isRel: false, + }, + { + name: "abs2", + base: "a", + target: "/a", + isRel: false, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.name, func(t *testing.T) { + ctx := &configErrorWrapper{} + out, isRel := MaybeRel(ctx, testCase.base, testCase.target) + if len(ctx.errors) > 0 { + t.Errorf("MaybeRel(..., %s, %s) reported unexpected errors %v", + testCase.base, testCase.target, ctx.errors) + } + if isRel != testCase.isRel || out != testCase.out { + t.Errorf("MaybeRel(..., %s, %s) want %v, %v got %v, %v", + testCase.base, testCase.target, testCase.out, testCase.isRel, out, isRel) + } + }) + } +} |