Skip to content

optimize runtime native libraries size #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

optimize runtime native libraries size #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1495047
optimize runtime native libraries size
blagoev Jul 19, 2016
f9908ea
switch to gcc toolchain for now
blagoev Jul 20, 2016
80f36a6
remove duplicate linker flag
blagoev Jul 20, 2016
70cc743
check for apk existence and print command usage
blagoev Jul 21, 2016
510840d
fix parent dir not exists exception
blagoev Jul 21, 2016
205b742
correctly exit node process in all error conditions (as per guidance …
blagoev Jul 21, 2016
6a43af9
run assembleRelease before runtests (new android plugin seems not to …
blagoev Jul 21, 2016
4b2a172
hook onto assembleRelease aswell
blagoev Jul 21, 2016
8c0888f
switch travis to release runtime build
blagoev Jul 21, 2016
7908914
revert hooking on release build
blagoev Jul 21, 2016
ed58404
forgotten file
blagoev Jul 21, 2016
eb86b1f
delete dist only when run
blagoev Jul 21, 2016
8e7fa43
fix syntax
blagoev Jul 21, 2016
84375a7
revert
blagoev Jul 21, 2016
41599df
speed up travis by building while the emulator is starting
blagoev Jul 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ script:
- "./gradlew createPackage -i -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace"
- echo no | android create avd --force -n Arm21 -t android-21 -b armeabi-v7a -c 12M
- emulator -avd Arm21 -no-skin -no-audio -no-window &
- "cd test-app && ./gradlew assembleDebug --stacktrace"
- android-wait-for-emulator
- "cd test-app && ./gradlew runtest --stacktrace"
- "./gradlew runtest --stacktrace"
- cd ..
before_deploy:
- FULL_PACKAGE_VERSION=`sed -n 's/\s*"version":\s*"\([a-zA-Z0-9\.]*\)"\s*,*/\1/p' dist/package.json`
Expand Down
151 changes: 0 additions & 151 deletions runtime/build-app.gradle
View file
Open in desktop

This file was deleted.

13 changes: 10 additions & 3 deletions runtime/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle-experimental:0.7.0-beta3'
classpath 'com.android.tools.build:gradle-experimental:0.8.0-alpha1'
}
}

Expand Down Expand Up @@ -49,7 +49,7 @@ model {
android.ndk {
moduleName = "NativeScript"


toolchain = "gcc"
cppFlags.addAll(["-I${file("src/main/jni")}".toString(),
"-I${file("src/main/jni/include")}".toString()
])
Expand All @@ -59,6 +59,8 @@ model {

ldLibs.addAll(["android", "dl", "log", "atomic", "z"])

ldFlags.addAll(["-Wl,--exclude-libs=ALL", "-Wl,--gc-sections"])

stl = "stlport_static"

abiFilters.addAll(["armeabi-v7a", "x86", "arm64-v8a"])
Expand Down Expand Up @@ -95,8 +97,13 @@ model {

ndk {
debuggable = ndkDebuggable

cppFlags.addAll(["-O3", "-fvisibility=hidden", "-ffunction-sections", "-fno-data-sections", "-Wl,--exclude-libs=ALL", "-Wl,--gc-sections"])
CFlags.addAll(["-O3", "-fvisibility=hidden", "-ffunction-sections", "-fno-data-sections", "-Wl,--exclude-libs=ALL", "--Wl,-gc-sections"])
}



setRuntimeCommit.dependsOn(setPackageVersion)

tasks.whenTaskAdded { task ->
Expand Down Expand Up @@ -225,4 +232,4 @@ task revertVersionFile(type: Exec) {
commandLine "git", "checkout", "--", versionFilePath
}
}
}
}
2 changes: 1 addition & 1 deletion runtime/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
5 changes: 4 additions & 1 deletion runtime/src/main/jni/CallbackHandlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,8 @@ Local<Value> CallbackHandlers::CallJSMethod(Isolate *isolate, JNIEnv *_env, cons
auto jsArgs = ArgConverter::ConvertJavaArgsToJsArgs(isolate, args);
int argc = jsArgs->Length();

Local<Value> arguments[argc];
//define k Local<Value>;
Local<Value>* arguments = new Local<Value>[argc];
for (int i = 0; i < argc; i++)
{
arguments[i] = jsArgs->Get(i);
Expand All @@ -848,6 +849,8 @@ Local<Value> CallbackHandlers::CallJSMethod(Isolate *isolate, JNIEnv *_env, cons
jsResult = jsMethod->Call(jsObject, argc, argc == 0 ? nullptr : arguments);
}

delete [] arguments;

//TODO: if javaResult is a pure js object create a java object that represents this object in java land

if (tc.HasCaught())
Expand Down
8 changes: 2 additions & 6 deletions runtime/src/main/jni/JavaObjectArrayCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,5 @@ jobjectArray JavaObjectArrayCache::GetJavaStringArray(int length)
return arr;
}

__thread jobjectArray JavaObjectArrayCache::s_objArr[MAX_JAVA_PARAMS_COUNT] =
{
nullptr };
__thread jobjectArray JavaObjectArrayCache::s_strArr[MAX_OVERWRITE_METHOD_COUNT] =
{
nullptr };
__thread jobjectArray JavaObjectArrayCache::s_objArr[MAX_JAVA_PARAMS_COUNT] = { nullptr };
__thread jobjectArray JavaObjectArrayCache::s_strArr[MAX_OVERWRITE_METHOD_COUNT] = { nullptr };
2 changes: 1 addition & 1 deletion runtime/src/main/jni/SimpleProfiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define SIMPLEPROFILER_H_

#include "v8.h"
#include <cstdint>
//#include <cstdint>
#include <vector>

namespace tns
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/main/jni/com_tns_AssetExtractor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using namespace std;

void mkdir_rec(const char *dir);

extern "C" void Java_com_tns_AssetExtractor_extractAssets(JNIEnv *env, jobject obj, jstring apk, jstring inputDir, jstring outputDir, jboolean _forceOverwrite)
extern "C" JNIEXPORT void Java_com_tns_AssetExtractor_extractAssets(JNIEnv *env, jobject obj, jstring apk, jstring inputDir, jstring outputDir, jboolean _forceOverwrite)
{
try
{
Expand Down
12 changes: 6 additions & 6 deletions runtime/src/main/jni/com_tns_JsDebugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using namespace tns;
using namespace std;

extern "C" void Java_com_tns_JsDebugger_processDebugMessages(JNIEnv *env, jobject obj)
extern "C" JNIEXPORT void Java_com_tns_JsDebugger_processDebugMessages(JNIEnv *env, jobject obj)
{
try
{
Expand All @@ -31,7 +31,7 @@ extern "C" void Java_com_tns_JsDebugger_processDebugMessages(JNIEnv *env, jobjec
}
}

extern "C" void Java_com_tns_JsDebugger_enable(JNIEnv *env, jobject obj)
extern "C" JNIEXPORT void Java_com_tns_JsDebugger_enable(JNIEnv *env, jobject obj)
{
try
{
Expand All @@ -53,7 +53,7 @@ extern "C" void Java_com_tns_JsDebugger_enable(JNIEnv *env, jobject obj)
}
}

extern "C" void Java_com_tns_JsDebugger_disable(JNIEnv *env, jobject obj)
extern "C" JNIEXPORT void Java_com_tns_JsDebugger_disable(JNIEnv *env, jobject obj)
{
try
{
Expand All @@ -75,7 +75,7 @@ extern "C" void Java_com_tns_JsDebugger_disable(JNIEnv *env, jobject obj)
}
}

extern "C" void Java_com_tns_JsDebugger_debugBreak(JNIEnv *env, jobject obj)
extern "C" JNIEXPORT void Java_com_tns_JsDebugger_debugBreak(JNIEnv *env, jobject obj)
{
try
{
Expand All @@ -97,7 +97,7 @@ extern "C" void Java_com_tns_JsDebugger_debugBreak(JNIEnv *env, jobject obj)
}
}

extern "C" jboolean Java_com_tns_JsDebugger_isDebuggerActive(JNIEnv *env, jobject obj)
extern "C" JNIEXPORT jboolean Java_com_tns_JsDebugger_isDebuggerActive(JNIEnv *env, jobject obj)
{
try
{
Expand All @@ -119,7 +119,7 @@ extern "C" jboolean Java_com_tns_JsDebugger_isDebuggerActive(JNIEnv *env, jobjec
}
}

extern "C" void Java_com_tns_JsDebugger_sendCommand(JNIEnv *_env, jobject obj, jbyteArray command, jint length)
extern "C" JNIEXPORT void Java_com_tns_JsDebugger_sendCommand(JNIEnv *_env, jobject obj, jbyteArray command, jint length)
{
try
{
Expand Down
Loading