openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix null pointer dereference in Soong on dexpreopt arc-services. 

The null pointer dereference was caused by trying to get device name
from a config passed to dexpreopt. For Make modules, the config is a
stub that doesn't have a device name. The fix is to use build directory
instead of device name (it is provided both by the full config passed
to Soong modules and by the stub config passed to Make modules).

Test: walleye-userdebug boots.
Test: aosp_bertha_arm-userdebug builds and generates arc-services.odex.

Bug: 152193534
Change-Id: I7adc173646cae6eaee188c6672629a5a942aea06
Merged-In: I7adc173646cae6eaee188c6672629a5a942aea06
(cherry picked from commit 9790f1058b)
This commit is contained in:
Ulya Trafimovich 2020-03-23 14:35:58 +00:00
parent 54c481ed62
commit b358ebb759
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dexpreopt/dexpreopt.go
View File

@ -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 // at that time (Soong processes the jars in dependency order, which may be different from the
// the system server classpath order). // the system server classpath order).
func SystemServerDexJarHostPath(ctx android.PathContext, jar string) android.OutputPath { func SystemServerDexJarHostPath(ctx android.PathContext, jar string) android.OutputPath {
return android.PathForOutput(ctx, ctx.Config().DeviceName(), "system_server_dexjars", jar+".jar") return android.PathForOutput(ctx, ctx.Config().BuildDir(), "system_server_dexjars", jar+".jar")
} }
func contains(l []string, s string) bool { func contains(l []string, s string) bool {