Fix mismatching path to ICU source in build-script and build-script-impl

build-script-impl assumes ICU is located at
```
LIBICU_SOURCE_DIR="${WORKSPACE}/icu"
```

However, build-script would try to set it to
```
<path-to-workspace>/libicu"
```

This is wrong, so fix it
This commit is contained in:
Hugh Bellamy
2017-02-23 21:15:58 +07:00
parent 99f9581802
commit 00b8913efa
3 changed files with 21 additions and 2 deletions

View File

@@ -608,10 +608,13 @@ class BuildScriptInvocation(object):
# Compute any product specific cmake arguments.
for product_class in self.compute_product_classes():
product_name = product_class.product_name()
product_source_name = product_class.product_source_name()
source_dir = self.workspace.source_dir(product_source_name)
product = product_class(
args=args,
toolchain=self.toolchain,
source_dir=self.workspace.source_dir(product_name),
source_dir=source_dir,
# FIXME: This is incorrect since it always assumes the host
# target I think?
build_dir=self.workspace.build_dir(