diff options
| author | Ulya Trafimovich <skvadrik@google.com> | 2020-03-24 13:59:24 +0000 |
|---|---|---|
| committer | Ulya Trafimovich <skvadrik@google.com> | 2020-03-24 14:09:43 +0000 |
| commit | f798c3ec32535ae3df58499daa66b56fb4167a57 (patch) | |
| tree | b9e20e3e5777e05ffaac8bf6f9f9554566c15d7b | |
| parent | b4cf9df628595c66ad04cfcf270d1e67330119b6 (diff) | |
| download | build_soong-f798c3ec32535ae3df58499daa66b56fb4167a57.tar.gz build_soong-f798c3ec32535ae3df58499daa66b56fb4167a57.tar.bz2 build_soong-f798c3ec32535ae3df58499daa66b56fb4167a57.zip | |
Don't append build directory to the output path twice.
Soong already uses build directory as a part of the generated output
path. Besides, trying to append it second time breaks if the build
directory is an absolute path.
Test: frameworks/rs/build_rs.py (uses absolute build directory path)
Test: walleye-userdebug boots
Bug: 152235239
Change-Id: Ie03c9e688013b9a3e6bc859c936d89c538ded76a
| -rw-r--r-- | dexpreopt/dexpreopt.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go index 02e54b3e..0e1bfc61 100644 --- a/dexpreopt/dexpreopt.go +++ b/dexpreopt/dexpreopt.go @@ -589,7 +589,7 @@ func NonUpdatableSystemServerJars(ctx android.PathContext, global *GlobalConfig) // at that time (Soong processes the jars in dependency order, which may be different from the // the system server classpath order). func SystemServerDexJarHostPath(ctx android.PathContext, jar string) android.OutputPath { - return android.PathForOutput(ctx, ctx.Config().BuildDir(), "system_server_dexjars", jar+".jar") + return android.PathForOutput(ctx, "system_server_dexjars", jar+".jar") } func contains(l []string, s string) bool { |