(ddc) Fix deps tracking for the ddc sdk.

sigmundch · commit-bot@chromium.org · commit 603fd7881f3c · 2019-11-23T00:21:58.000Z
The compile_platform template assumes that the output will be in the root-out-dir, and because of that the generated .deps file contains relative paths that only work if the output is in that folder. It would be nice to fix compile_platform to be more flexible about this, but for now moving the output up fixes the issue that modifications in the sdk were not triggering a rebuild. Change-Id: Ifc1e7adb23d6911a9f71c341b7968e0a9b1d4973 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/126122 Reviewed-by: Nicholas Shahan <nshahan@google.com> Commit-Queue: Sigmund Cherem <sigmund@google.com>
diff --git a/pkg/dev_compiler/test/sourcemap/README.md b/pkg/dev_compiler/test/sourcemap/README.md
@@ -7,7 +7,7 @@ For both there are 2 suits: One for (legacy) DDC and one for DDC with kernel (DD
 
 Running the tests likely requires the compilation of the correct targets. DDK currently also
 requires `ddc_sdk.dill` inside
-`{sdkroot}/{out,xcodebuild}/ReleaseX64/gen/utils/dartdevc/kernel/ddc_sdk.dill`.
+`{sdkroot}/{out,xcodebuild}/ReleaseX64/ddc_sdk.dill`.
 
 Except for that, running them should simply be a matter of executing the `*_suite.dart` files.
 
diff --git a/pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart b/pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart
@@ -56,7 +56,7 @@ class DevCompilerRunner implements CompilerRunner {
     File sdkJsFile = findInOutDir("gen/utils/dartdevc/js/es6/dart_sdk.js");
     var jsSdkPath = sdkJsFile.uri;
 
-    File ddcSdkSummary = findInOutDir("gen/utils/dartdevc/kernel/ddc_sdk.dill");
+    File ddcSdkSummary = findInOutDir("ddc_sdk.dill");
 
     List<String> args = <String>[
       "--packages=${sdkRoot.uri.resolve(".packages").toFilePath()}",
diff --git a/pkg/dev_compiler/tool/ddc b/pkg/dev_compiler/tool/ddc
@@ -51,7 +51,8 @@ then
   fi
 fi
 
-GEN_DIR="$OUT_DIR"/"$DART_CONFIGURATION"/gen/utils/dartdevc
+ROOT_OUT_DIR="$OUT_DIR"/"$DART_CONFIGURATION"
+GEN_DIR="$ROOT_OUT_DIR"/gen/utils/dartdevc
 
 KERNEL=false
 if [ "$1" = "-k" ]; then
@@ -64,7 +65,7 @@ LIBROOT=$(cd $( dirname "${1%.*}") && pwd)
 
 if [ "$KERNEL" = true ]; then
 
-  if [ ! -e $GEN_DIR/kernel/ddc_sdk.dill ]; then
+  if [ ! -e $ROOT_OUT_DIR/ddc_sdk.dill ]; then
     echo "DDC SDK must be built first, please run:"
     echo "    pushd $SDKDIR"
     echo "    ./tools/build.py -m release dartdevc_kernel_sdk"
@@ -74,7 +75,7 @@ if [ "$KERNEL" = true ]; then
   NODE_PATH=$GEN_DIR/kernel/common:$LIBROOT:$NODE_PATH
 
   $SDK_DIR/sdk/bin/dartdevc --kernel --modules=node \
-      --dart-sdk-summary=$GEN_DIR/ddc_sdk.sum \
+      --dart-sdk-summary=$ROOT_OUT_DIR/ddc_sdk.dill \
       -o $LIBROOT/$BASENAME.js $*
 else
 
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
@@ -697,7 +697,7 @@ copy("copy_dev_compiler_summary") {
   sources = [
     # TODO(vsm): Remove post CFE.
     "$gen_dir/ddc_sdk.sum",
-    "$gen_dir/kernel/ddc_sdk.dill",
+    "$root_out_dir/ddc_sdk.dill",
   ]
   outputs = [
     "$root_out_dir/dart-sdk/lib/_internal/{{source_file_part}}",
diff --git a/sdk_nnbd/BUILD.gn b/sdk_nnbd/BUILD.gn
@@ -697,7 +697,7 @@ copy("copy_dev_compiler_summary") {
   sources = [
     # TODO(vsm): Remove post CFE.
     "$gen_dir/ddc_sdk.sum",
-    "$gen_dir/kernel/ddc_sdk.dill",
+    "$root_out_dir/ddc_sdk.dill",
   ]
   outputs = [
     "$root_out_dir/dart-sdk/lib/_internal/{{source_file_part}}",
diff --git a/utils/dartdevc/BUILD.gn b/utils/dartdevc/BUILD.gn
@@ -10,8 +10,11 @@ import("../create_timestamp.gni")
 
 patched_sdk_dir = "$target_gen_dir/patched_sdk"
 sdk_summary = "$target_gen_dir/ddc_sdk.sum"
-sdk_outline_dill = "$target_gen_dir/kernel/ddc_sdk.dill"
-sdk_full_dill = "$target_gen_dir/kernel/ddc_sdk_full.dill"
+
+# TODO(sigmund): rename to ddc_outline.dill to be consistent with the naming
+# convention from other tools.
+sdk_outline_dill = "$root_out_dir/ddc_sdk.dill"
+sdk_full_dill = "$root_out_dir/ddc_platform.dill"
 
 if (use_nnbd) {
   libraries_specification_path = "sdk_nnbd/lib/libraries.json"

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ copy("copy_dev_compiler_summary") {`
`697`	`697`	`sources = [`
`698`	`698`	`# TODO(vsm): Remove post CFE.`
`699`	`699`	`"$gen_dir/ddc_sdk.sum",`
`700`		`- "$gen_dir/kernel/ddc_sdk.dill",`
	`700`	`+ "$root_out_dir/ddc_sdk.dill",`
`701`	`701`	`]`
`702`	`702`	`outputs = [`
`703`	`703`	`"$root_out_dir/dart-sdk/lib/_internal/{{source_file_part}}",`