Skip to content

Commit e0a688f

Browse files
author
Vasil Hristov
authored
Merge pull request #1192 from NativeScript/master
RC
2 parents d0a1b24 + b440a46 commit e0a688f

104 files changed

Lines changed: 6360 additions & 4693 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
==
33

44
## What's New
5-
- [Added support for before-plugins.gradle file applied before plugin(#1183)](https://github.com/NativeScript/android-runtime/pull/1185)
6-
- [Make JSParser in SBG fail the build when failing(#1152)](https://github.com/NativeScript/android-runtime/issues/1152)
7-
- [Generate interface names list in SBG in parallel(#1132)](https://github.com/NativeScript/android-runtime/issues/1132)
8-
- [Upgrade android gradle plugin to 3.2.0(#1147)](https://github.com/NativeScript/android-runtime/issues/1147)
5+
- [Upgrade v8 to 6.9.427.23(#1168)](https://github.com/NativeScript/android-runtime/issues/1168)
6+
- [Added support for before-plugins.gradle file applied before plugin(#1183)](https://github.com/NativeScript/android-runtime/pull/1185)
7+
- [Make JSParser in SBG fail the build when failing(#1152)](https://github.com/NativeScript/android-runtime/issues/1152)
8+
- [Generate interface names list in SBG in parallel(#1132)](https://github.com/NativeScript/android-runtime/issues/1132)
9+
- [Upgrade android gradle plugin to 3.2.0(#1147)](https://github.com/NativeScript/android-runtime/issues/1147)
910

1011
## Bug Fixes
1112

@@ -16,11 +17,11 @@
1617
==
1718

1819
## What's New
19-
- [Upgrade v8 to 6.7.288.46(#1130)](https://github.com/NativeScript/android-runtime/issues/1130)
20-
- [Static binding generator now uses bundled npm packages(#1096)](https://github.com/NativeScript/android-runtime/issues/1096)
21-
- [Add gradle dependencies versions in package.json(#1102)](https://github.com/NativeScript/android-runtime/issues/1102)
22-
- [Introduce a setting for auto catching exceptions when calling JS method native(#1119)](https://github.com/NativeScript/android-runtime/issues/1119)
23-
- [Make livesync work entirely through named sockets(#932)](https://github.com/NativeScript/android-runtime/issues/932)
20+
- [Upgrade v8 to 6.7.288.46(#1130)](https://github.com/NativeScript/android-runtime/issues/1130)
21+
- [Static binding generator now uses bundled npm packages(#1096)](https://github.com/NativeScript/android-runtime/issues/1096)
22+
- [Add gradle dependencies versions in package.json(#1102)](https://github.com/NativeScript/android-runtime/issues/1102)
23+
- [Introduce a setting for auto catching exceptions when calling JS method native(#1119)](https://github.com/NativeScript/android-runtime/issues/1119)
24+
- [Make livesync work entirely through named sockets(#932)](https://github.com/NativeScript/android-runtime/issues/932)
2425

2526
## Bug Fixes
2627

‎build-artifacts/project-template-gradle/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"v8Version": "6.7.288.46"
2+
"v8Version": "6.9.427.23"
33
}

‎test-app/app/src/main/assets/app/modules/libCalc-arm.so‎

-1.03 MB
Binary file not shown.

‎test-app/app/src/main/assets/app/modules/libCalc-arm64.so‎

-1.43 MB
Binary file not shown.

‎test-app/app/src/main/assets/app/modules/libCalc-x86.so‎

-1.18 MB
Binary file not shown.

‎test-app/runtime/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@ MESSAGE( STATUS "# CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS} )
179179
# linking v8 and inspector libraries to runtime(NativeScript library)
180180
target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libzip.a )
181181
target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_base.a )
182+
target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_snapshot.a )
182183
target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_init.a )
183184
target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_initializers.a )
184185
target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_libplatform.a )
185186
target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_libsampler.a )
186187
target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_libbase.a )
187-
target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_snapshot.a )
188188

189189
# Command info: https://cmake.org/cmake/help/v3.4/command/find_library.html
190190
# Searches for a specified prebuilt library and stores the path as a
@@ -195,7 +195,6 @@ target_link_libraries( NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROI
195195
find_library( system-log log )
196196
find_library( system-android android )
197197
find_library( system-dl dl )
198-
find_library( system-atomic atomic ) # TODO: plamen5kov: can't be found in ndk for some reasong ... look at it later (maybe deprecated in newer NDK versions)
199198
find_library( system-z z )
200199

201200
# Command info: https://cmake.org/cmake/help/v3.4/command/target_link_libraries.html

‎test-app/runtime/src/main/cpp/ObjectManager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@ void ObjectManager::MarkReachableObjects(Isolate* isolate, const Local<Object>&
482482
}
483483

484484
auto o = top.As<Object>();
485-
if(!isInFirstRun) {
486-
uint8_t* addr = NativeScriptExtension::GetAddress(o);
485+
if (!isInFirstRun) {
486+
unsigned long addr = NativeScriptExtension::GetAddress(o);
487487
auto itFound = m_visited.find(addr);
488488
if (itFound != m_visited.end()) {
489489
continue;

‎test-app/runtime/src/main/cpp/ObjectManager.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class ObjectManager {
201201

202202
PersistentObjectIdSet m_released;
203203

204-
std::set<uint8_t*> m_visited;
204+
std::set<unsigned long> m_visited;
205205

206206
LRUCache<int, jweak> m_cache;
207207

‎test-app/runtime/src/main/cpp/Profiler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ void Profiler::StopCPUProfilerCallbackImpl(const v8::FunctionCallbackInfo<v8::Va
8282
}
8383

8484
void Profiler::StartCPUProfiler(Isolate* isolate, const Local<String>& name) {
85-
auto v8prof = isolate->GetCpuProfiler();
85+
auto v8prof = CpuProfiler::New(isolate);
8686
v8prof->StartProfiling(name, true);
8787
}
8888

8989
bool Profiler::StopCPUProfiler(Isolate* isolate, const Local<String>& name) {
90-
auto v8prof = isolate->GetCpuProfiler();
90+
auto v8prof = CpuProfiler::New(isolate);
9191
auto cpuProfile = v8prof->StopProfiling(name);
9292

9393
auto success = false;

‎test-app/runtime/src/main/cpp/include/V8NativeScriptExtension.h‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
#include "v8.h"
22

33
namespace v8 {
4-
5-
class NativeScriptExtension {
6-
public:
7-
static uint8_t* GetAddress(const v8::Local<v8::Object>& obj);
84

9-
static v8::Local<v8::Value>* GetClosureObjects(v8::Isolate *isolate, const v8::Local<v8::Function>& func, int *length);
5+
class NativeScriptExtension {
6+
public:
7+
static unsigned long GetAddress(const v8::Local<v8::Object>& obj);
108

11-
static void ReleaseClosureObjects(v8::Local<v8::Value>* closureObjects);
12-
13-
static void GetAssessorPair(v8::Isolate *isolate, const v8::Local<v8::Object>& obj, const v8::Local<v8::String>& propName, v8::Local<v8::Value>& getter, v8::Local<v8::Value>& setter);
9+
static v8::Local<v8::Value>* GetClosureObjects(v8::Isolate* isolate, const v8::Local<v8::Function>& func, int* length);
1410

15-
static v8::Local<v8::Array> GetPropertyKeys(v8::Isolate *isolate, const v8::Local<v8::Context>& context, const v8::Local<v8::Object>& object, bool& success);
11+
static void ReleaseClosureObjects(v8::Local<v8::Value>* closureObjects);
1612

17-
static void CpuFeaturesProbe(bool cross_compile);
18-
private:
19-
NativeScriptExtension();
13+
static void GetAssessorPair(v8::Isolate* isolate, const v8::Local<v8::Object>& obj, const v8::Local<v8::String>& propName, v8::Local<v8::Value>& getter, v8::Local<v8::Value>& setter);
2014

21-
// static v8::internal::Handle<v8::internal::FixedArray> GetEnumPropertyKeys(const v8::internal::Handle<v8::internal::JSObject>& object, bool cache_result);
22-
};
15+
static v8::Local<v8::Array> GetPropertyKeys(v8::Isolate* isolate, const v8::Local<v8::Context>& context, const v8::Local<v8::Object>& object, bool& success);
16+
17+
static void CpuFeaturesProbe(bool cross_compile);
18+
private:
19+
NativeScriptExtension();
20+
};
2321
}
22+

0 commit comments

Comments
 (0)