Bug fix: soong_zip should be invoked with -C argument
If it is alled with -D <abspath> without preceding -C argument, soong
fails with 'Rel: can't make <abspath relative to'. The error occurs
while trying to build Android to the explicitly specifiied directory,
e.g. `OUT_DIR_COMMON_BASE=/foo/bar m`
Bug: 123976090
Test: build with OUT_DIR_COMMON_BASE set
Change-Id: I9ca64ec2c6f29381207ed1e3e52a1e0c3eb0675c
diff --git a/build/hidl_interface.go b/build/hidl_interface.go
index 179642f..0154a61 100644
--- a/build/hidl_interface.go
+++ b/build/hidl_interface.go
@@ -47,9 +47,11 @@
}, "depfile", "fqName", "genDir", "language", "roots")
hidlSrcJarRule = pctx.StaticRule("hidlSrcJarRule", blueprint.RuleParams{
- Depfile: "${depfile}",
- Deps: blueprint.DepsGCC,
- Command: "rm -rf ${genDir} && ${hidl} -R -p . -d ${depfile} -o ${genDir}/srcs -L ${language} ${roots} ${fqName} && ${soong_zip} -o ${genDir}/srcs.srcjar -D ${genDir}/srcs",
+ Depfile: "${depfile}",
+ Deps: blueprint.DepsGCC,
+ Command: "rm -rf ${genDir} && " +
+ "${hidl} -R -p . -d ${depfile} -o ${genDir}/srcs -L ${language} ${roots} ${fqName} && " +
+ "${soong_zip} -o ${genDir}/srcs.srcjar -C ${genDir}/srcs -D ${genDir}/srcs",
CommandDeps: []string{"${hidl}", "${soong_zip}"},
Description: "HIDL ${language}: ${in} => srcs.srcjar",
}, "depfile", "fqName", "genDir", "language", "roots")