Skip to content
This repository was archived by the owner on Mar 25, 2019. It is now read-only.

Commit 12cf68a

Browse files
author
ericwlange
committed
Removing hemroid dependency to simply build
Shared libraries have stabilized, so no need to keep hemroid structure Added shared libraries directly to the project Code coverage at 94%
1 parent 3ab97aa commit 12cf68a

134 files changed

Lines changed: 2196 additions & 209 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.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ libs/
66
obj
77
project.properties
88
build/
9-
lib/
109
*~

AndroidJSCore/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@
77
/build
88
/captures
99
/AndroidJSCore/libs
10-
/AndroidJSCore/src/main/jniLibs
11-
/AndroidJSCore/src/main/java/org/liquidplayer/hemroid

AndroidJSCore/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AndroidJSCore/AndroidJSCore/build.gradle

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ apply plugin: 'com.android.library'
44
apply plugin: 'jacoco'
55

66
android {
7-
compileSdkVersion 23
7+
compileSdkVersion 24
88
buildToolsVersion "23.0.2"
99

1010
defaultConfig {
1111
minSdkVersion 11
12-
targetSdkVersion 23
12+
targetSdkVersion 24
1313
versionCode 3
1414
versionName "3.0-pre2"
1515
setProperty("archivesBaseName", "AndroidJSCore-$versionName")
@@ -24,14 +24,15 @@ android {
2424
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2525
}
2626
}
27+
sourceSets { main { jniLibs.srcDirs 'libs' } }
2728
}
2829

2930
dependencies {
3031
compile fileTree(dir: 'libs', include: ['*.jar'])
3132
testCompile 'junit:junit:4.12'
32-
compile 'com.android.support:appcompat-v7:23.4.0'
33-
androidTestCompile 'junit:junit:4.+'
34-
androidTestCompile 'com.android.support:support-annotations:23+'
33+
compile 'com.android.support:appcompat-v7:24.1.1'
34+
androidTestCompile 'junit:junit:4.0'
35+
androidTestCompile 'com.android.support:support-annotations:24.1.1'
3536
androidTestCompile 'com.android.support.test:runner:0.5'
3637
androidTestCompile 'com.android.support.test:rules:0.5'
3738
androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
@@ -41,34 +42,15 @@ task hemroidBuild(type: Exec) {
4142
def rootDir = project.rootDir
4243
def localProperties = new File(rootDir, "local.properties")
4344
def ndkDir = ''
44-
def sdkDir = ''
45-
def hemroidDir = 'foo'
4645
if (localProperties.exists()) {
4746
Properties properties = new Properties()
4847
localProperties.withInputStream { instr ->
4948
properties.load(instr)
5049
}
5150
ndkDir = properties.getProperty('ndk.dir')
52-
sdkDir = properties.getProperty('sdk.dir')
53-
try {
54-
def stdout = new ByteArrayOutputStream()
55-
def result = exec {
56-
executable = "which"
57-
args = ["hemroid"]
58-
standardOutput = stdout;
59-
}
60-
hemroidDir = FilenameUtils.getFullPathNoEndSeparator(stdout.toString())
61-
} catch (Throwable e) {
62-
hemroidDir = ''
63-
}
64-
}
65-
if (hemroidDir != '') {
66-
executable "sh"
67-
args "-c", "NDK_MODULE_PATH=$hemroidDir/packages ANDROID_SDK=$sdkDir ANDROID_NDK=$ndkDir $ndkDir/ndk-build"
68-
} else {
69-
executable "echo"
70-
args "'hemroid' not in the path. Make sure you add it to the PATH variable and run gradle explicitly."
7151
}
52+
executable "sh"
53+
args "-c", "$ndkDir/ndk-build"
7254
}
7355

7456
preBuild.dependsOn hemroidBuild

AndroidJSCore/AndroidJSCore/jni/Android.mk

Lines changed: 66 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,69 @@
3232

3333
LOCAL_PATH := $(call my-dir)
3434

35+
include $(CLEAR_VARS)
36+
LOCAL_MODULE := javascriptcore
37+
LOCAL_SHARED_LIBRARIES := glib icu
38+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libjavascriptcoregtk-4.0.so
39+
include $(PREBUILT_SHARED_LIBRARY)
40+
41+
include $(CLEAR_VARS)
42+
LOCAL_MODULE := icuuc
43+
LOCAL_SHARED_LIBRARIES := icudata
44+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libicuhemuc.so
45+
include $(PREBUILT_SHARED_LIBRARY)
46+
47+
include $(CLEAR_VARS)
48+
LOCAL_MODULE := icui18n
49+
LOCAL_SHARED_LIBRARIES := icudata
50+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libicuhemi18n.so
51+
include $(PREBUILT_SHARED_LIBRARY)
52+
53+
include $(CLEAR_VARS)
54+
LOCAL_MODULE := icudata
55+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libicuhemdata.so
56+
include $(PREBUILT_SHARED_LIBRARY)
57+
58+
include $(CLEAR_VARS)
59+
LOCAL_MODULE := ffi
60+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libffi.so
61+
include $(PREBUILT_SHARED_LIBRARY)
62+
63+
include $(CLEAR_VARS)
64+
LOCAL_MODULE := intl
65+
LOCAL_SHARED_LIBRARIES := iconv
66+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libintl.so
67+
include $(PREBUILT_SHARED_LIBRARY)
68+
69+
include $(CLEAR_VARS)
70+
LOCAL_MODULE := glib
71+
LOCAL_SHARED_LIBRARIES := iconv ffi intl
72+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libglib-2.0.so
73+
include $(PREBUILT_SHARED_LIBRARY)
74+
75+
include $(CLEAR_VARS)
76+
LOCAL_MODULE := gmodule
77+
LOCAL_SHARED_LIBRARIES := glib
78+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libgmodule-2.0.so
79+
include $(PREBUILT_SHARED_LIBRARY)
80+
81+
include $(CLEAR_VARS)
82+
LOCAL_MODULE := gio
83+
LOCAL_SHARED_LIBRARIES := glib gmodule
84+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libgio-2.0.so
85+
include $(PREBUILT_SHARED_LIBRARY)
86+
87+
include $(CLEAR_VARS)
88+
LOCAL_MODULE := gobject
89+
LOCAL_SHARED_LIBRARIES := glib ffi
90+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libgobject-2.0.so
91+
include $(PREBUILT_SHARED_LIBRARY)
92+
93+
include $(CLEAR_VARS)
94+
LOCAL_MODULE := iconv
95+
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/libiconv.so
96+
include $(PREBUILT_SHARED_LIBRARY)
97+
3598
include $(CLEAR_VARS)
3699

37100
LOCAL_MODULE := android-js-core
@@ -42,14 +105,9 @@ LOCAL_SRC_FILES := JSContext.cpp \
42105
Instance.cpp \
43106
JSFunction.cpp
44107

45-
HEMROID_MODULES := javascriptcore_$(TARGET_ARCH_ABI) icustub_$(TARGET_ARCH_ABI)
46-
LOCAL_SHARED_LIBRARIES := $(HEMROID_MODULES)
108+
LOCAL_SHARED_LIBRARIES := javascriptcore
47109

48-
LOCAL_CPPFLAGS := -std=c++11 -fexceptions
110+
LOCAL_CPPFLAGS := -std=c++11 -fexceptions -I$(LOCAL_PATH)/include
49111
LOCAL_LDFLAGS := -llog
50112

51-
include $(BUILD_SHARED_LIBRARY)
52-
53-
$(call import-module, hemroid)
54-
$(call import-module, javascriptcore)
55-
$(call import-module, icu/icustub)
113+
include $(BUILD_SHARED_LIBRARY)

AndroidJSCore/AndroidJSCore/jni/Application.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3232

3333
APP_ABI := all
34-
APP_PLATFORM := android-9
34+
APP_PLATFORM := android-13
3535
APP_STL := gnustl_shared
3636
NDK_TOOLCHAIN_VERSION=4.9
Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
/*
2+
* Copyright (C) 2006 Apple Inc. All rights reserved.
3+
*
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions
6+
* are met:
7+
* 1. Redistributions of source code must retain the above copyright
8+
* notice, this list of conditions and the following disclaimer.
9+
* 2. Redistributions in binary form must reproduce the above copyright
10+
* notice, this list of conditions and the following disclaimer in the
11+
* documentation and/or other materials provided with the distribution.
12+
*
13+
* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14+
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18+
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19+
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21+
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24+
*/
25+
26+
#ifndef JSBase_h
27+
#define JSBase_h
28+
29+
#ifndef __cplusplus
30+
#include <stdbool.h>
31+
#endif
32+
33+
#ifdef __OBJC__
34+
#import <Foundation/Foundation.h>
35+
#endif
36+
37+
/* JavaScript engine interface */
38+
39+
/*! @typedef JSContextGroupRef A group that associates JavaScript contexts with one another. Contexts in the same group may share and exchange JavaScript objects. */
40+
typedef const struct OpaqueJSContextGroup* JSContextGroupRef;
41+
42+
/*! @typedef JSContextRef A JavaScript execution context. Holds the global object and other execution state. */
43+
typedef const struct OpaqueJSContext* JSContextRef;
44+
45+
/*! @typedef JSGlobalContextRef A global JavaScript execution context. A JSGlobalContext is a JSContext. */
46+
typedef struct OpaqueJSContext* JSGlobalContextRef;
47+
48+
/*! @typedef JSStringRef A UTF16 character buffer. The fundamental string representation in JavaScript. */
49+
typedef struct OpaqueJSString* JSStringRef;
50+
51+
/*! @typedef JSClassRef A JavaScript class. Used with JSObjectMake to construct objects with custom behavior. */
52+
typedef struct OpaqueJSClass* JSClassRef;
53+
54+
/*! @typedef JSPropertyNameArrayRef An array of JavaScript property names. */
55+
typedef struct OpaqueJSPropertyNameArray* JSPropertyNameArrayRef;
56+
57+
/*! @typedef JSPropertyNameAccumulatorRef An ordered set used to collect the names of a JavaScript object's properties. */
58+
typedef struct OpaqueJSPropertyNameAccumulator* JSPropertyNameAccumulatorRef;
59+
60+
61+
/* JavaScript data types */
62+
63+
/*! @typedef JSValueRef A JavaScript value. The base type for all JavaScript values, and polymorphic functions on them. */
64+
typedef const struct OpaqueJSValue* JSValueRef;
65+
66+
/*! @typedef JSObjectRef A JavaScript object. A JSObject is a JSValue. */
67+
typedef struct OpaqueJSValue* JSObjectRef;
68+
69+
/* JavaScript symbol exports */
70+
/* These rules should stay the same as in WebKit2/Shared/API/c/WKBase.h */
71+
72+
#undef JS_EXPORT
73+
#if defined(JS_NO_EXPORT)
74+
#define JS_EXPORT
75+
#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
76+
#define JS_EXPORT __attribute__((visibility("default")))
77+
#elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__)
78+
#if defined(BUILDING_JavaScriptCore) || defined(STATICALLY_LINKED_WITH_JavaScriptCore)
79+
#define JS_EXPORT __declspec(dllexport)
80+
#else
81+
#define JS_EXPORT __declspec(dllimport)
82+
#endif
83+
#else /* !defined(JS_NO_EXPORT) */
84+
#define JS_EXPORT
85+
#endif /* defined(JS_NO_EXPORT) */
86+
87+
#ifdef __cplusplus
88+
extern "C" {
89+
#endif
90+
91+
/* Script Evaluation */
92+
93+
/*!
94+
@function JSEvaluateScript
95+
@abstract Evaluates a string of JavaScript.
96+
@param ctx The execution context to use.
97+
@param script A JSString containing the script to evaluate.
98+
@param thisObject The object to use as "this," or NULL to use the global object as "this."
99+
@param sourceURL A JSString containing a URL for the script's source file. This is used by debuggers and when reporting exceptions. Pass NULL if you do not care to include source file information.
100+
@param startingLineNumber An integer value specifying the script's starting line number in the file located at sourceURL. This is only used when reporting exceptions. The value is one-based, so the first line is line 1 and invalid values are clamped to 1.
101+
@param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
102+
@result The JSValue that results from evaluating script, or NULL if an exception is thrown.
103+
*/
104+
JS_EXPORT JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception);
105+
106+
/*!
107+
@function JSCheckScriptSyntax
108+
@abstract Checks for syntax errors in a string of JavaScript.
109+
@param ctx The execution context to use.
110+
@param script A JSString containing the script to check for syntax errors.
111+
@param sourceURL A JSString containing a URL for the script's source file. This is only used when reporting exceptions. Pass NULL if you do not care to include source file information in exceptions.
112+
@param startingLineNumber An integer value specifying the script's starting line number in the file located at sourceURL. This is only used when reporting exceptions. The value is one-based, so the first line is line 1 and invalid values are clamped to 1.
113+
@param exception A pointer to a JSValueRef in which to store a syntax error exception, if any. Pass NULL if you do not care to store a syntax error exception.
114+
@result true if the script is syntactically correct, otherwise false.
115+
*/
116+
JS_EXPORT bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception);
117+
118+
/*!
119+
@function JSGarbageCollect
120+
@abstract Performs a JavaScript garbage collection.
121+
@param ctx The execution context to use.
122+
@discussion JavaScript values that are on the machine stack, in a register,
123+
protected by JSValueProtect, set as the global object of an execution context,
124+
or reachable from any such value will not be collected.
125+
126+
During JavaScript execution, you are not required to call this function; the
127+
JavaScript engine will garbage collect as needed. JavaScript values created
128+
within a context group are automatically destroyed when the last reference
129+
to the context group is released.
130+
*/
131+
JS_EXPORT void JSGarbageCollect(JSContextRef ctx);
132+
133+
#ifdef __cplusplus
134+
}
135+
#endif
136+
137+
/* Enable the Objective-C API for platforms with a modern runtime. */
138+
#if !defined(JSC_OBJC_API_ENABLED)
139+
#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && !defined(BUILDING_GTK__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
140+
#endif
141+
142+
#endif /* JSBase_h */

0 commit comments

Comments
 (0)