AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prepare skia for shared library build on android

Browse Source 
This reapplies revision 9378 after the buildbot has been updated.

R=borenet@google.com, djsollen@google.com

Review URL: https://codereview.chromium.org/15855006

git-svn-id: http://skia.googlecode.com/svn/trunk@9395 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
djsollen@google.com 2013-06-03 12:10:19 +00:00
parent 2dd76d7668
commit 52f0297aaf
33 changed files with 131 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -45,7 +45,7 @@ VALID_TARGETS := \
pathops_unittest \
SampleApp \
SkiaAndroidApp \
skia_base_libs \
skia_lib \
tests \
tools

3
gyp/FileReaderApp.gyp
View File

@ -18,8 +18,7 @@
'../src/utils/mac/SkOSWindow_Mac.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'skia_lib.gyp:skia_lib',
'views.gyp:views',
'xml.gyp:xml',
],

4
gyp/SampleApp.gyp
View File

@ -142,9 +142,7 @@
'../samplecode/SampleFontCache.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
'views.gyp:views',
'animator.gyp:animator',
'xml.gyp:xml',

2
gyp/SimpleCocoaApp.gyp
View File

@ -25,7 +25,7 @@
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'skia_lib.gyp:skia_lib',
'views.gyp:views',
'xml.gyp:xml',
],

4
gyp/SimpleiOSApp.gyp
View File

@ -28,9 +28,7 @@
'../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
'views.gyp:views',
'xml.gyp:xml',
],

6
gyp/bench.gyp
View File

@ -17,9 +17,7 @@
'bench.gypi'
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
'bench_timer',
],
'conditions': [
@ -50,7 +48,7 @@
'../src/gpu',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'skia_lib.gyp:skia_lib',
],
'conditions': [
[ 'skia_os not in ["mac", "ios"]', {

9
gyp/common.gypi
View File

@ -39,6 +39,15 @@
}],
],
},
# Validate the 'skia_os' setting against 'skia_shared_lib', because shared
# library build is only supported on Android.
'variables': {
'conditions': [
[ 'skia_os != "android" and skia_shared_lib', {
'error': '<!(Skia shared lib build only currently supported on Android.)',
}],
],
},
'includes': [
'common_conditions.gypi',
],

11
gyp/common_conditions.gypi
View File

@ -326,6 +326,17 @@
[ 'skia_profile_enabled == 1', {
'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
}],
[ 'skia_shared_lib', {
'cflags': [
'-fPIC',
],
'defines': [
'GR_DLL=1',
'GR_IMPLEMENTATION=1',
'SKIA_DLL',
'SKIA_IMPLEMENTATION=1',
],
}],
[ 'skia_arch_type == "arm" and arm_thumb == 1', {
'cflags': [
'-mthumb',

2
gyp/common_variables.gypi
View File

@ -90,6 +90,7 @@
'skia_osx_sdkroot%': '',
'skia_profile_enabled%': 0,
'skia_win_debuggers_path%': '',
'skia_shared_lib%': 0,
},
'conditions': [
@ -121,6 +122,7 @@
'skia_gpu%': '<(skia_gpu)',
'skia_osx_sdkroot%': '<(skia_osx_sdkroot)',
'skia_profile_enabled%': '<(skia_profile_enabled)',
'skia_shared_lib%': '<(skia_shared_lib)',
'skia_static_initializers%': '<(skia_static_initializers)',
'ios_sdk_version%': '6.0',
'skia_win_debuggers_path%': '<(skia_win_debuggers_path)',

8
gyp/core.gyp
View File

@ -76,6 +76,11 @@
'config/win',
],
}],
[ 'skia_os == "android"', {
'sources': [
'../src/core/SkPaintOptionsAndroid.cpp',
],
}],
[ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', {
# The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.
'sources': [
@ -120,9 +125,6 @@
}],
],
},
'dependencies': [
'opts.gyp:opts'
],
},
],
}

7
gyp/debugger.gyp
View File

@ -94,17 +94,12 @@
'../debugger/SkObjectParser.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'images.gyp:images',
'effects.gyp:effects',
'skia_lib.gyp:skia_lib',
'bench.gyp:bench_timer',
'tools.gyp:picture_renderer',
],
'conditions': [
[ 'skia_os == "nacl"', {
'dependencies': [
'utils.gyp:utils', # For SkBase64.h
],
'include_dirs': [
'../src/utils',
],

7
gyp/effects.gyp
View File

@ -9,7 +9,10 @@
'effects.gypi',
],
'include_dirs': [
'../include/config',
'../include/core',
'../include/effects',
'../include/utils',
'../src/core',
],
'direct_dependent_settings': {
@ -17,15 +20,13 @@
'../include/effects',
],
},
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
],
'sources': [
'effects.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
],
'conditions': [
['skia_gpu == 1', {
'include_dirs': [
'../include/gpu',
'../src/gpu',
],
}],

3
gyp/flags.gyp
View File

@ -10,8 +10,7 @@
'../tools/flags/SkCommandLineFlags.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'core.gyp:core',
'skia_lib.gyp:skia_lib',
],
'direct_dependent_settings': {
'include_dirs': [

7
gyp/gm.gyp
View File

@ -16,7 +16,7 @@
'../gm/gm_expectations.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'skia_lib.gyp:skia_lib',
'core.gyp:core',
'images.gyp:images',
'jsoncpp.gyp:jsoncpp',
@ -57,14 +57,11 @@
'../src/pipe/utils/SamplePipeControllers.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'skia_lib.gyp:skia_lib',
'flags.gyp:flags',
'gm.gyp:gm_expectations',
'images.gyp:images',
'jsoncpp.gyp:jsoncpp',
'pdf.gyp:pdf',
'utils.gyp:utils',
],
'conditions': [
['skia_os == "mac"', {

2
gyp/most.gyp
View File

@ -10,7 +10,7 @@
'type': 'none',
'dependencies': [
# The minimal set of static libraries for basic Skia functionality.
'skia_base_libs.gyp:skia_base_libs',
'skia_lib.gyp:skia_lib',
'bench.gyp:bench',
'gm.gyp:gm',

2
gyp/nacl.gyp
View File

@ -5,7 +5,7 @@
'target_name': 'nacl_interface',
'type': 'static_library',
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'skia_lib.gyp:skia_lib',
],
'include_dirs': [
# For SkThreadUtils.h

5
gyp/pathops_unittest.gyp
View File

@ -27,11 +27,8 @@
'../tests/Test.h',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'skia_lib.gyp:skia_lib',
'flags.gyp:flags',
'images.gyp:images',
'utils.gyp:utils',
],
'conditions': [
[ 'skia_gpu == 1', {

2
gyp/pdf.gyp
View File

@ -6,7 +6,7 @@
'type': 'static_library',
'standalone_static_library': 1,
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'skia_lib.gyp:skia_lib',
'zlib.gyp:zlib',
],
'include_dirs': [

4
gyp/pixman_test.gyp
View File

@ -118,10 +118,8 @@
'../../../pixman/pixman/pixman.h',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'skia_lib.gyp:skia_lib',
'experimental.gyp:experimental',
'images.gyp:images',
'pdf.gyp:pdf',
'views.gyp:views',
'xml.gyp:xml',

9
gyp/ports.gyp
View File

@ -6,18 +6,17 @@
'product_name': 'skia_ports',
'type': 'static_library',
'standalone_static_library': 1,
'dependencies': [
'core.gyp:core',
'sfnt.gyp:sfnt',
'utils.gyp:utils',
],
'include_dirs': [
'../include/config',
'../include/core',
'../include/effects',
'../include/images',
'../include/ports',
'../include/utils',
'../include/xml',
'../src/core',
'../src/lazy',
'../src/sfnt',
'../src/utils',
],
'sources': [

5
gyp/sfnt.gyp
View File

@ -5,10 +5,9 @@
'product_name': 'skia_sfnt',
'type': 'static_library',
'standalone_static_library': 1,
'dependencies': [
'core.gyp:core',
],
'include_dirs': [
'../include/config',
'../include/core',
'../src/sfnt',
],
'sources': [

4
gyp/shapeops_demo.gyp
View File

@ -69,9 +69,7 @@
'../experimental/Intersection/TriangleUtilities.h',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
'views.gyp:views',
'xml.gyp:xml',
],

4
gyp/shapeops_edge.gyp
View File

@ -115,9 +115,7 @@
'../experimental/Intersection/thingsToDo.txt',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
],
'conditions': [
[ 'skia_gpu == 1', {

10
gyp/shapeops_tool.gyp
View File

@ -15,23 +15,15 @@
'../experimental/Intersection/AddTestOutput/main.cpp',
],
'dependencies': [
'core.gyp:core',
'effects.gyp:effects',
'skia_lib.gyp:skia_lib',
'experimental.gyp:experimental',
'images.gyp:images',
'ports.gyp:ports',
'pdf.gyp:pdf',
'utils.gyp:utils',
],
'conditions': [
[ 'skia_gpu == 1', {
'include_dirs': [
'../src/gpu',
],
'dependencies': [
'gpu.gyp:gr',
'gpu.gyp:skgr',
],
}],
],
},

24
gyp/skia_base_libs.gyp → gyp/skia_lib.gyp
View File

@ -1,10 +1,14 @@
# The minimal set of static libraries for basic Skia functionality.
{
'variables': {
'component_libs': [
'core.gyp:core',
'effects.gyp:effects',
'images.gyp:images',
'opts.gyp:opts',
'ports.gyp:ports',
'sfnt.gyp:sfnt',
'utils.gyp:utils',
],
'conditions': [
@ -33,8 +37,24 @@
},
'targets': [
{
'target_name': 'skia_base_libs',
'type': 'none',
'target_name': 'skia_lib',
'conditions': [
[ 'skia_shared_lib', {
'conditions': [
[ 'skia_os == "android"', {
# The name skia will confuse the linker on android into using the system's libskia.so
# instead of the one packaged with the apk. We simply choose a different name to fix
# this.
'product_name': 'skia_android',
}, {
'product_name': 'skia',
}],
],
'type': 'shared_library',
}, {
'type': 'none',
}],
],
'dependencies': [
'<@(component_libs)',
],

6
gyp/tests.gyp
View File

@ -128,15 +128,11 @@
'../src/pipe/utils/SamplePipeControllers.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'skia_lib.gyp:skia_lib',
'flags.gyp:flags',
'experimental.gyp:experimental',
'images.gyp:images',
'pdf.gyp:pdf',
'tools.gyp:picture_utils',
'utils.gyp:utils',
'sfnt.gyp:sfnt',
],
'conditions': [
[ 'skia_gpu == 1', {

47
gyp/tools.gyp
View File

@ -37,9 +37,7 @@
'../tools/skdiff_utils.h',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
],
},
{
@ -55,9 +53,7 @@
'../tools/skdiff_utils.h',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
],
},
{
@ -67,10 +63,8 @@
'../tools/skhello.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'skia_lib.gyp:skia_lib',
'flags.gyp:flags',
'images.gyp:images',
],
},
{
@ -84,11 +78,9 @@
'../src/utils/',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'skia_lib.gyp:skia_lib',
'flags.gyp:flags',
'gm.gyp:gm_expectations',
'images.gyp:images',
'jsoncpp.gyp:jsoncpp',
'utils.gyp:utils',
],
@ -102,7 +94,7 @@
'../src/utils/SkLua.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'skia_lib.gyp:skia_lib',
'effects.gyp:effects',
'utils.gyp:utils',
'images.gyp:images',
@ -123,10 +115,9 @@
'../src/pipe/utils/',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'skia_lib.gyp:skia_lib',
'tools.gyp:picture_renderer',
'tools.gyp:picture_utils',
'ports.gyp:ports',
'flags.gyp:flags',
],
},
@ -146,12 +137,10 @@
'../src/lazy/',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'skia_lib.gyp:skia_lib',
'tools.gyp:picture_utils',
'tools.gyp:picture_renderer',
'bench.gyp:bench_timer',
'ports.gyp:ports',
'flags.gyp:flags',
],
},
@ -174,9 +163,7 @@
'../src/utils/',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
'tools.gyp:picture_utils',
'flags.gyp:flags',
],
@ -189,9 +176,6 @@
},
],
],
'export_dependent_settings': [
'images.gyp:images',
],
},
{
'target_name': 'render_pdfs',
@ -206,11 +190,8 @@
'../src/utils/',
],
'dependencies': [
'core.gyp:core',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
'pdf.gyp:pdf',
'ports.gyp:ports',
'tools.gyp:picture_utils',
],
'conditions': [
@ -257,7 +238,7 @@
'../tools/picture_utils.h',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'skia_lib.gyp:skia_lib',
],
'direct_dependent_settings': {
'include_dirs': [
@ -272,9 +253,7 @@
'../tools/pinspect.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
],
},
{
@ -296,9 +275,7 @@
'../debugger/SkObjectParser.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
'tools.gyp:picture_utils',
],
},

3
gyp/xps.gyp
View File

@ -6,8 +6,7 @@
'type': 'static_library',
'standalone_static_library': 1,
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'images.gyp:images',
'skia_lib.gyp:skia_lib',
'sfnt.gyp:sfnt',
],
'include_dirs': [

11
platform_tools/android/app/src/com/skia/SkiaIntentService.java
View File

@ -16,7 +16,7 @@ public class SkiaIntentService extends IntentService {
public SkiaIntentService() {
super("SkiaIntentService");
}
@Override
public IBinder onBind(Intent arg0) {
return null;
@ -25,12 +25,12 @@ public class SkiaIntentService extends IntentService {
public void onCreate() {
super.onCreate();
}
@Override
public void onDestroy() {
super.onDestroy();
}
@Override
public void onHandleIntent(Intent intent) {
@ -51,10 +51,11 @@ public class SkiaIntentService extends IntentService {
String cmd = bundle.getString("args").trim();
String[] args = cmd.split("\\s+");
Log.d("skia", "Executing Command: " + cmd);
// Load the requested library
String lib = args[0];
try {
System.loadLibrary("skia_android");
System.loadLibrary(lib);
} catch (UnsatisfiedLinkError e) {
Log.e("skia", "Library " + lib +
@ -62,7 +63,7 @@ public class SkiaIntentService extends IntentService {
SkiaReturn(-1, returnRepeats);
throw e;
}
// JNI call to run the program
int retval = run(args);
SkiaReturn(retval, returnRepeats);

1
platform_tools/android/app/src/com/skia/SkiaSampleActivity.java
View File

@ -42,6 +42,7 @@ public class SkiaSampleActivity extends Activity
mSlideList = new ArrayAdapter<String>(this, android.R.layout.simple_expandable_list_item_1);
try {
System.loadLibrary("skia_android");
System.loadLibrary("SampleApp");
LinearLayout holder = (LinearLayout) findViewById(R.id.holder);

1
platform_tools/android/bin/android_setup.sh
View File

@ -126,6 +126,7 @@ setup_device() {
DEFINES="${DEFINES} skia_os=android"
DEFINES="${DEFINES} android_base=${SCRIPT_DIR}/.."
DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}"
DEFINES="${DEFINES} skia_shared_lib=1"
# Setup the build variation depending on the target device
TARGET_DEVICE="$1"

2
platform_tools/android/gyp/skia_android.gypi
View File

@ -4,6 +4,7 @@
'target_name': 'CopySkiaAppDeps',
'type': 'none',
'dependencies': [
'skia_lib.gyp:skia_lib',
'SampleApp.gyp:SampleApp',
'bench.gyp:bench',
'gm.gyp:gm',
@ -56,6 +57,7 @@
'<(PRODUCT_DIR)/lib.target/libtests.so',
'<(PRODUCT_DIR)/lib.target/libpathops_unittest.so',
'<(PRODUCT_DIR)/lib.target/gdbserver',
'<(PRODUCT_DIR)/lib.target/libskia_android.so',
],
},
],

40
platform_tools/android/launcher/skia_launcher.cpp
View File

@ -28,6 +28,29 @@ int launch_app(int (*app_main)(int, const char**), int argc,
return (*app_main)(argc, argv);
}
void* load_library(const char** argv, const char* libraryName)
{
// attempt to lookup the location of the shared libraries
char libraryLocation[100];
sprintf(libraryLocation, "%s/lib/lib%s.so", argv[0], libraryName);
if (!file_exists(libraryLocation)) {
printf("ERROR: Unable to find the appropriate library in the Skia App.\n");
printf("ERROR: Did you provide the correct program_name?\n");
usage(argv[0]);
return NULL;
}
// load the appropriate library
void* appLibrary = dlopen(libraryLocation, RTLD_LOCAL | RTLD_LAZY);
if (!appLibrary) {
printf("ERROR: Unable to open the shared library.\n");
printf("ERROR: %s", dlerror());
return NULL;
}
return appLibrary;
}
int main(int argc, const char** argv) {
// check that the program name was specified
@ -44,21 +67,16 @@ int main(int argc, const char** argv) {
return -1;
}
// attempt to lookup the location of the shared libraries
char libraryLocation[100];
sprintf(libraryLocation, "%s/lib/lib%s.so", appLocation, argv[1]);
if (!file_exists(libraryLocation)) {
printf("ERROR: Unable to find the appropriate library in the Skia App.\n");
printf("ERROR: Did you provide the correct program_name?\n");
usage(argv[0]);
// load the local skia shared library
void* skiaLibrary = load_library(argv, "libskia_android.so");
if (NULL == skiaLibrary)
{
return -1;
}
// load the appropriate library
void* appLibrary = dlopen(libraryLocation, RTLD_LOCAL | RTLD_LAZY);
if (!appLibrary) {
printf("ERROR: Unable to open the shared library.\n");
printf("ERROR: %s", dlerror());
void* appLibrary = load_library(argv, argv[1]);
if (NULL == appLibrary) {
return -1;
}