diff options
| author |  brandjon <brandjon@google.com> | 2017-12-21 16:57:31 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-21 16:59:14 -0800 |
| commit | 85e8d51c72c5dcb4d1f6a8f3186149339ca59fac (patch) | |
| tree | 674f045964f8479f8d150d030433b7c7d2e9596e /src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java | |
| parent | 7139420f25f1bfb3fdf3b50b1b260c339c94c20e (diff) | |
Remove testing flag --internal_do_not_export_builtins
Also add a @VisibleForTesting accessor to SkyframeExecutor.
RELNOTES: None
PiperOrigin-RevId: 179875655
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java index 41cc8b19b9..ad4c5a9d74 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java @@ -385,9 +385,7 @@ public class SkylarkImportLookupFunction implements SkyFunction { .createSkylarkRuleClassEnvironment( extensionLabel, mutability, skylarkSemantics, eventHandler, ast.getContentHashCode(), importMap); - if (!skylarkSemantics.internalDoNotExportBuiltins()) { - extensionEnv.setupOverride("native", packageFactory.getNativeModule(inWorkspace)); - } + extensionEnv.setupOverride("native", packageFactory.getNativeModule(inWorkspace)); execAndExport(ast, extensionLabel, eventHandler, extensionEnv); Event.replayEventsOn(env.getListener(), eventHandler.getEvents()); |