df1c3373fc
When checking the skia_arch_type for "x86", instead of doing an == compare, check if "x86" in skia_arch_type, so it will cover both x86 and x86_64. Except when we specifically want x86. Set skia_arch_width based on "64" in skia_arch_type. No need to specify in scripts. In gyp_to_android.py, create a separate var_dict for x86_64. BUG=skia:3419 Review URL: https://codereview.chromium.org/916113002
104 lines
3.4 KiB
Python
104 lines
3.4 KiB
Python
#
|
|
{
|
|
'targets': [
|
|
{
|
|
'target_name': 'CopySampleAppDeps',
|
|
'type': 'none',
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
'SampleApp.gyp:SampleApp',
|
|
],
|
|
'variables': {
|
|
'conditions': [
|
|
[ 'skia_arch_type == "arm" and arm_version != 7', {
|
|
'android_arch%': "armeabi",
|
|
}],
|
|
[ 'skia_arch_type == "arm" and arm_version == 7', {
|
|
'android_arch%': "armeabi-v7a",
|
|
}],
|
|
[ 'skia_arch_type == "arm64"', {
|
|
'android_arch%': "arm64-v8a",
|
|
}],
|
|
[ 'skia_arch_type == "x86"', {
|
|
'android_arch%': "x86",
|
|
}],
|
|
[ 'skia_arch_type == "x86_64"', {
|
|
'android_arch%': "x86_64",
|
|
}],
|
|
[ 'skia_arch_type == "mips" and skia_arch_width == 32', {
|
|
'android_arch%': "mips",
|
|
}],
|
|
[ 'skia_arch_type == "mips" and skia_arch_width == 64', {
|
|
'android_arch%': "mips64",
|
|
}],
|
|
],
|
|
},
|
|
'copies': [
|
|
# Copy all shared libraries into the Android app's libs folder. Note
|
|
# that this copy requires us to build SkiaAndroidApp after those
|
|
# libraries, so that they exist by the time it occurs. If there are no
|
|
# libraries to copy, this will cause an error in Make, but the app will
|
|
# still build.
|
|
{
|
|
'destination': '<(PRODUCT_DIR)/android/libs/<(android_arch)',
|
|
'conditions': [
|
|
[ 'skia_shared_lib', {
|
|
'files': [
|
|
'<(SHARED_LIB_DIR)/libSampleApp.so',
|
|
'<(SHARED_LIB_DIR)/libskia_android.so',
|
|
]}, {
|
|
'files': [
|
|
'<(SHARED_LIB_DIR)/libSampleApp.so',
|
|
]}
|
|
],
|
|
],
|
|
},
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'SampleApp_APK',
|
|
'type': 'none',
|
|
'dependencies': [
|
|
'CopySampleAppDeps',
|
|
],
|
|
'variables': {
|
|
'ANDROID_SDK_ROOT': '<!(echo $ANDROID_SDK_ROOT)',
|
|
# the ninja generator treats PRODUCT_DIR as a relative path to the
|
|
# gyp directory but android ant build wants a path relative to the
|
|
# build.xml file so we do that adjustment here.
|
|
'ANDROID_OUT': '../../<(PRODUCT_DIR)/android'
|
|
},
|
|
'actions': [
|
|
{
|
|
'action_name': 'SkiaAndroid_apk',
|
|
'inputs': [
|
|
'<(android_base)/app/AndroidManifest.xml',
|
|
'<(android_base)/app/build.xml',
|
|
'<(android_base)/app/project.properties',
|
|
'<(android_base)/app/jni/com_skia_SkiaSampleRenderer.h',
|
|
'<(android_base)/app/jni/com_skia_SkiaSampleRenderer.cpp',
|
|
'<(android_base)/app/src/com/skia/SkiaSampleActivity.java',
|
|
'<(android_base)/app/src/com/skia/SkiaSampleRenderer.java',
|
|
'<(android_base)/app/src/com/skia/SkiaSampleView.java',
|
|
],
|
|
'outputs': [
|
|
'<(PRODUCT_DIR)/../android/bin/SkiaAndroid.apk',
|
|
],
|
|
'action': [
|
|
'ant',
|
|
'-quiet',
|
|
'-f',
|
|
'<(android_base)/app/build.xml',
|
|
'-Dout.dir=<(ANDROID_OUT)/bin',
|
|
'-Dgen.absolute.dir=<(ANDROID_OUT)/gen',
|
|
'-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs',
|
|
'-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk',
|
|
'-Dsdk.dir=<(ANDROID_SDK_ROOT)',
|
|
'debug',
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
}
|