summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoyee Cheung <joyeec9h3@gmail.com>2019-02-10 17:10:17 +0800
committerJoyee Cheung <joyeec9h3@gmail.com>2019-02-13 06:11:41 +0800
commit68afae2f228f7aab59798b75df03da0feb30825d (patch)
tree0642b21fce8f8232449eb9694e1856fd74f4c157
parent771b2901daae2e4389d157c18bb0f6674a0a19a4 (diff)
downloadandroid-node-v8-68afae2f228f7aab59798b75df03da0feb30825d.tar.gz
android-node-v8-68afae2f228f7aab59798b75df03da0feb30825d.tar.bz2
android-node-v8-68afae2f228f7aab59798b75df03da0feb30825d.zip
lib: move per_context.js under lib/internal/bootstrap
PR-URL: https://github.com/nodejs/node/pull/26033 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
-rw-r--r--lib/internal/bootstrap/cache.js3
-rw-r--r--lib/internal/bootstrap/context.js (renamed from lib/internal/per_context.js)0
-rw-r--r--node.gyp2
-rw-r--r--src/api/environment.cc4
4 files changed, 4 insertions, 5 deletions
diff --git a/lib/internal/bootstrap/cache.js b/lib/internal/bootstrap/cache.js
index da8c4bda9a..3840d7ee25 100644
--- a/lib/internal/bootstrap/cache.js
+++ b/lib/internal/bootstrap/cache.js
@@ -18,10 +18,9 @@ const cannotBeRequired = [
'internal/v8_prof_polyfill',
'internal/v8_prof_processor',
- 'internal/per_context',
-
'internal/test/binding',
+ 'internal/bootstrap/context',
'internal/bootstrap/primordials',
'internal/bootstrap/loaders',
'internal/bootstrap/node'
diff --git a/lib/internal/per_context.js b/lib/internal/bootstrap/context.js
index 725ba403df..725ba403df 100644
--- a/lib/internal/per_context.js
+++ b/lib/internal/bootstrap/context.js
diff --git a/node.gyp b/node.gyp
index efafbb7afa..da3e5ee845 100644
--- a/node.gyp
+++ b/node.gyp
@@ -25,7 +25,7 @@
'node_lib_target_name%': 'node_lib',
'node_intermediate_lib_type%': 'static_library',
'library_files': [
- 'lib/internal/per_context.js',
+ 'lib/internal/bootstrap/context.js',
'lib/internal/bootstrap/primordials.js',
'lib/internal/bootstrap/cache.js',
'lib/internal/bootstrap/loaders.js',
diff --git a/src/api/environment.cc b/src/api/environment.cc
index bac3a1e42b..f93fcd738d 100644
--- a/src/api/environment.cc
+++ b/src/api/environment.cc
@@ -192,7 +192,7 @@ Local<Context> NewContext(Isolate* isolate,
True(isolate));
{
- // Run lib/internal/per_context.js
+ // Run lib/internal/bootstrap/context.js
Context::Scope context_scope(context);
std::vector<Local<String>> parameters = {
@@ -200,7 +200,7 @@ Local<Context> NewContext(Isolate* isolate,
Local<Value> arguments[] = {context->Global()};
MaybeLocal<Function> maybe_fn =
per_process::native_module_loader.LookupAndCompile(
- context, "internal/per_context", &parameters, nullptr);
+ context, "internal/bootstrap/context", &parameters, nullptr);
if (maybe_fn.IsEmpty()) {
return Local<Context>();
}