diff options
Diffstat (limited to 'support/android')
| -rw-r--r-- | support/android/apk/AndroidManifest.xml | 27 | ||||
| -rw-r--r-- | support/android/apk/build.xml | 92 | ||||
| -rw-r--r-- | support/android/apk/jni/Android.mk | 22 | ||||
| -rw-r--r-- | support/android/apk/jni/Application.mk | 2 | ||||
| -rw-r--r-- | support/android/apk/jni/main.c | 58 | ||||
| -rw-r--r-- | support/android/apk/project.properties | 1 | ||||
| -rw-r--r-- | support/android/apk/res/mipmap/servo.png | bin | 0 -> 521100 bytes | |||
| -rw-r--r-- | support/android/apk/src/com/mozilla/servo/MainActivity.java | 8 | ||||
| -rw-r--r-- | support/android/build-apk/Cargo.lock | 4 | ||||
| -rw-r--r-- | support/android/build-apk/Cargo.toml | 13 | ||||
| -rw-r--r-- | support/android/build-apk/src/main.rs | 302 |
11 files changed, 529 insertions, 0 deletions
diff --git a/support/android/apk/AndroidManifest.xml b/support/android/apk/AndroidManifest.xml new file mode 100644 index 00000000000..5f3a9e1ea5e --- /dev/null +++ b/support/android/apk/AndroidManifest.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- BEGIN_INCLUDE(manifest) --> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.mozilla.servo" + android:versionCode="1" + android:versionName="1.0"> + + <uses-sdk android:minSdkVersion="18" /> + + <uses-feature android:glEsVersion="0x00020000" android:required="true"></uses-feature> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + + <application android:label="Servo" android:icon="@mipmap/servo"> + <activity android:name="com.mozilla.servo.MainActivity" + android:label="Servo" + android:configChanges="orientation|keyboardHidden"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest> +<!-- END_INCLUDE(manifest) --> diff --git a/support/android/apk/build.xml b/support/android/apk/build.xml new file mode 100644 index 00000000000..3d1611517a8 --- /dev/null +++ b/support/android/apk/build.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="Servo" default="help"> + + <!-- The local.properties file is created and updated by the 'android' tool. + It contains the path to the SDK. It should *NOT* be checked into + Version Control Systems. --> + <property file="local.properties" /> + + <!-- The ant.properties file can be created by you. It is only edited by the + 'android' tool to add properties to it. + This is the place to change some Ant specific build properties. + Here are some properties you may want to change/update: + + source.dir + The name of the source directory. Default is 'src'. + out.dir + The name of the output directory. Default is 'bin'. + + For other overridable properties, look at the beginning of the rules + files in the SDK, at tools/ant/build.xml + + Properties related to the SDK location or the project target should + be updated using the 'android' tool with the 'update' action. + + This file is an integral part of the build system for your + application and should be checked into Version Control Systems. + + --> + <property file="ant.properties" /> + + <!-- if sdk.dir was not set from one of the property file, then + get it from the ANDROID_HOME env var. + This must be done before we load project.properties since + the proguard config can use sdk.dir --> + <property environment="env" /> + <condition property="sdk.dir" value="${env.ANDROID_HOME}"> + <isset property="env.ANDROID_HOME" /> + </condition> + + <!-- The project.properties file is created and updated by the 'android' + tool, as well as ADT. + + This contains project specific properties such as project target, and library + dependencies. Lower level build properties are stored in ant.properties + (or in .classpath for Eclipse projects). + + This file is an integral part of the build system for your + application and should be checked into Version Control Systems. --> + <loadproperties srcFile="project.properties" /> + + <!-- quick check on sdk.dir --> + <fail + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." + unless="sdk.dir" + /> + + <!-- + Import per project custom build rules if present at the root of the project. + This is the place to put custom intermediary targets such as: + -pre-build + -pre-compile + -post-compile (This is typically used for code obfuscation. + Compiled code location: ${out.classes.absolute.dir} + If this is not done in place, override ${out.dex.input.absolute.dir}) + -post-package + -post-build + -pre-clean + --> + <import file="custom_rules.xml" optional="true" /> + + <!-- Import the actual build file. + + To customize existing targets, there are two options: + - Customize only one target: + - copy/paste the target into this file, *before* the + <import> task. + - customize it to your needs. + - Customize the whole content of build.xml + - copy/paste the content of the rules files (minus the top node) + into this file, replacing the <import> task. + - customize to your needs. + + *********************** + ****** IMPORTANT ****** + *********************** + In all cases you must update the value of version-tag below to read 'custom' instead of an integer, + in order to avoid having your file be overridden by tools such as "android update project" + --> + <!-- version-tag: 1 --> + <import file="${sdk.dir}/tools/ant/build.xml" /> + +</project> diff --git a/support/android/apk/jni/Android.mk b/support/android/apk/jni/Android.mk new file mode 100644 index 00000000000..d922b052b4e --- /dev/null +++ b/support/android/apk/jni/Android.mk @@ -0,0 +1,22 @@ +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := servo +LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libmain.so +include $(PREBUILT_SHARED_LIBRARY) + +# $(call import-module) diff --git a/support/android/apk/jni/Application.mk b/support/android/apk/jni/Application.mk new file mode 100644 index 00000000000..3784f3fc6c5 --- /dev/null +++ b/support/android/apk/jni/Application.mk @@ -0,0 +1,2 @@ +APP_ABI := armeabi +APP_PLATFORM := android-18 diff --git a/support/android/apk/jni/main.c b/support/android/apk/jni/main.c new file mode 100644 index 00000000000..beddf906059 --- /dev/null +++ b/support/android/apk/jni/main.c @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +//BEGIN_INCLUDE(all) +#include <jni.h> +#include <errno.h> +#include <dlfcn.h> +#include <stdlib.h> + +#include <android/log.h> +#include <android_native_app_glue.h> + +#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "servo-wrapper", __VA_ARGS__)) +#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "servo-wrapper", __VA_ARGS__)) + +/** + * This is the main entry point of a native application that is using + * android_native_app_glue. It runs in its own thread, with its own + * event loop for receiving input events and doing other things. + */ +void android_main(struct android_app* state) { + LOGI("in android_main"); + void* libservo = dlopen("libservo.so", RTLD_NOW); + if (libservo == NULL) { + LOGI("failed to load servo lib: %s", dlerror()); + return; + } + + LOGI("loaded libservo.so"); + void (*android_main)(struct android_app*); + *(void**)(&android_main) = dlsym(libservo, "android_main"); + if (android_main) { + LOGI("go into android_main()"); + (*android_main)(state); + return; + } +} +//END_INCLUDE(all) + +int main(int argc, char* argv[]) +{ + LOGI("WAT"); + return 0; +} diff --git a/support/android/apk/project.properties b/support/android/apk/project.properties new file mode 100644 index 00000000000..c0442c37105 --- /dev/null +++ b/support/android/apk/project.properties @@ -0,0 +1 @@ +target=android-18 diff --git a/support/android/apk/res/mipmap/servo.png b/support/android/apk/res/mipmap/servo.png Binary files differnew file mode 100644 index 00000000000..5d5ef43bbc2 --- /dev/null +++ b/support/android/apk/res/mipmap/servo.png diff --git a/support/android/apk/src/com/mozilla/servo/MainActivity.java b/support/android/apk/src/com/mozilla/servo/MainActivity.java new file mode 100644 index 00000000000..d99478ee3da --- /dev/null +++ b/support/android/apk/src/com/mozilla/servo/MainActivity.java @@ -0,0 +1,8 @@ +package com.mozilla.servo; +import android.util.Log; + +public class MainActivity extends android.app.NativeActivity { + static { + Log.i("servo_wrapper", "Loading the NativeActivity"); + } +} diff --git a/support/android/build-apk/Cargo.lock b/support/android/build-apk/Cargo.lock new file mode 100644 index 00000000000..aa6f83fabec --- /dev/null +++ b/support/android/build-apk/Cargo.lock @@ -0,0 +1,4 @@ +[root] +name = "build-apk" +version = "0.0.1" + diff --git a/support/android/build-apk/Cargo.toml b/support/android/build-apk/Cargo.toml new file mode 100644 index 00000000000..23257facd3b --- /dev/null +++ b/support/android/build-apk/Cargo.toml @@ -0,0 +1,13 @@ +[package] + +name = "build-apk" +version = "0.0.1" +authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>", "The Servo Project Developers"] + +[[bin]] +name = "build-apk" +path = "src/main.rs" +test = false +doc = false +bench = false + diff --git a/support/android/build-apk/src/main.rs b/support/android/build-apk/src/main.rs new file mode 100644 index 00000000000..460dd620da1 --- /dev/null +++ b/support/android/build-apk/src/main.rs @@ -0,0 +1,302 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +//extern crate num; +#![feature(dir_builder, fs_walk)] +use std::collections::{HashMap, HashSet}; +use std::env; +use std::fs; +use std::fs::DirBuilder; +use std::path::{Path, PathBuf}; +use std::process; +use std::process::{Command, Stdio}; + +fn main() { + let (args, passthrough) = parse_arguments(); + + // Find all the native shared libraries that exist in the target directory. + let native_shared_libs = find_native_libs(&args); + + // Get the SDK path from the ANDROID_HOME env. + let sdk_path = env::var("ANDROID_HOME").ok().expect("Please set the ANDROID_HOME environment variable"); + let sdk_path = Path::new(&sdk_path); + + // Get the NDK path from NDK_HOME env. + let ndk_path = env::var("NDK_HOME").ok().expect("Please set the NDK_HOME environment variable"); + let ndk_path = Path::new(&ndk_path); + + // Get the standalone NDK path from NDK_STANDALONE env. + // let standalone_path = env::var("NDK_STANDALONE").ok().unwrap_or("/opt/ndk_standalone".to_string()); + // let standalone_path = Path::new(&standalone_path); + + let debug = passthrough.contains(&"-d".to_string()); + + // Set the build directory that will contain all the necessary files to create the apk + let directory = args.root_path.join("support").join("android").join("apk"); + let resdir = args.root_path.join("resources/"); + + // executing ndk-build + env::set_var("V", "1"); + if debug { + env::set_var("NDK_DEBUG", "1"); + env::set_var("APP_OPTIM", "0"); + } else{ + // Overrides android:debuggable propery in the .xml file. + env::set_var("APP_OPTIM", "1"); + } + + // Copy libservo.so into the jni folder for inclusion in the build + // TODO: pass/detect target architecture + { + let source = &args.target_path.join("libservo.so"); + let target_dir = &directory.join("jni").join("armeabi"); + let _ = DirBuilder::new().recursive(true).create(target_dir); + let target = target_dir.join("libmain.so"); + println!("Copying the file {:?} to {:?}", source, target); + fs::copy(source, target).unwrap(); + } + + let ndkcmd = Command::new(ndk_path.join("ndk-build")) + .arg("-B") + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .current_dir(directory.clone()) + .status(); + if ndkcmd.is_err() || ndkcmd.unwrap().code().unwrap() != 0 { + println!("Error while executing program `ndk-build`, or missing program."); + process::exit(1); + } + + // Copy the additional native libs into the libs directory. + for (name, path) in native_shared_libs.iter() { + let target = &directory.join("libs").join("armeabi").join(name); + println!("Copying the file {:?} to {:?}", name, target); + fs::copy(path, target).unwrap(); + } + + // Copy over the resources + let cpcmd= Command::new("cp") + .arg("-R") + .arg(&resdir) + .arg(&directory.join("assets")) + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .current_dir(directory.clone()) + .status(); + if cpcmd.is_err() || cpcmd.unwrap().code().unwrap() != 0 { + println!("Error while copying files from the resources dir to the assets dir"); + process::exit(1); + } + + // Update the project + let androidcmd = Command::new(sdk_path.join("tools").join("android")) + .arg("update") + .arg("project") + .arg("--name") + .arg("Servo") + .arg("--target") + .arg("android-18") + .arg("--path") + .arg(".") + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .current_dir(directory.clone()) + .status(); + if androidcmd.is_err() || androidcmd.unwrap().code().unwrap() != 0 { + println!("Error while updating the project with the android command"); + process::exit(1); + } + + // Build the APK + let mut antcmd = Command::new("ant"); + if debug { + antcmd.arg("debug"); + } else { + antcmd.arg("release"); + } + let antresult = antcmd + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .current_dir(directory.clone()) + .status(); + if antresult.is_err() || antresult.unwrap().code().unwrap() != 0 { + println!("Error while executing program `ant`, or missing program."); + process::exit(1); + } + + // Copying apk file to the requested output + // Release builds also need to be signed. For now, we use a simple debug + // signing key. + if debug { + fs::copy(&directory.join("bin").join("Servo-debug.apk"), + &args.output).unwrap(); + } else { + let keystore_dir = env::home_dir().expect("Please have a home directory"); + let keystore_dir = Path::new(&keystore_dir).join(".keystore"); + let keytoolcmd = Command::new("keytool") + .arg("-list") + .arg("-storepass") + .arg("android") + .arg("-alias") + .arg("androiddebugkey") + .arg("-keystore") + .arg(&keystore_dir) + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .current_dir(directory.clone()) + .status(); + if keytoolcmd.is_err() || keytoolcmd.unwrap().code().unwrap() != 0 { + let keytoolcreatecmd = Command::new("keytool") + .arg("-genkeypair") + .arg("-keystore") + .arg(&keystore_dir) + .arg("-storepass") + .arg("android") + .arg("-alias") + .arg("androiddebugkey") + .arg("-keypass") + .arg("android") + .arg("-dname") + .arg("CN=Android Debug,O=Android,C=US") + .arg("-keyalg") + .arg("RSA") + .arg("-validity") + .arg("365") + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .current_dir(directory.clone()) + .status(); + if keytoolcreatecmd.is_err() || + keytoolcreatecmd.unwrap().code().unwrap() != 0 { + println!("Error while using `keytool` to create the debug keystore."); + process::exit(1); + } + } + + let jarsigncmd = Command::new("jarsigner") + .arg("-digestalg") + .arg("SHA1") + .arg("-sigalg") + .arg("MD5withRSA") + .arg("-storepass") + .arg("android") + .arg("-keystore") + .arg(&keystore_dir) + .arg(&directory.join("bin").join("Servo-release-unsigned.apk")) + .arg("androiddebugkey") + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .current_dir(directory.clone()) + .status(); + if jarsigncmd.is_err() || jarsigncmd.unwrap().code().unwrap() != 0 { + println!("Error while using `jarsign` to sign the APK."); + process::exit(1); + } + + let aligncmd = Command::new(sdk_path.join("tools").join("zipalign")) + .arg("-f") + .arg("-v") + .arg("4") + .arg(&directory.join("bin").join("Servo-release-unsigned.apk")) + .arg(&directory.join("bin").join("Servo-release.apk")) + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .current_dir(directory.clone()) + .status(); + if aligncmd.is_err() || aligncmd.unwrap().code().unwrap() != 0 { + println!("Error while using `zipalign` to sign the APK."); + process::exit(1); + } + + fs::copy(&directory.join("bin").join("Servo-release.apk"), + &args.output).unwrap(); + } + +} + +struct Args { + output: PathBuf, + root_path: PathBuf, + target_path: PathBuf, + shared_libraries: HashSet<String>, +} + +fn parse_arguments() -> (Args, Vec<String>) { + let mut result_output = None; + let mut result_root_path = None; + let mut result_target_path = None; + let mut result_shared_libraries = HashSet::new(); + let mut result_passthrough = Vec::new(); + + let args = env::args(); + let mut args = args.skip(1); + + loop { + let arg = match args.next() { + None => return ( + Args { + output: result_output.expect("Could not find -o argument"), + root_path: result_root_path.expect("Could not find -r enlistment root argument"), + target_path: result_target_path.expect("Could not find -t target path argument"), + shared_libraries: result_shared_libraries, + }, + result_passthrough + ), + Some(arg) => arg + }; + + match &*arg { + "-o" => { + result_output = Some(PathBuf::from(args.next().expect("-o must be followed by the output name"))); + }, + "-r" => { + result_root_path = Some(PathBuf::from(args.next().expect("-r must be followed by the enlistment root directory"))); + }, + "-t" => { + result_target_path = Some(PathBuf::from(args.next().expect("-t must be followed by the target output directory"))); + }, + "-l" => { + let name = args.next().expect("-l must be followed by a library name"); + result_shared_libraries.insert(vec!["lib", &name, ".so"].concat()); + + // Also pass these through. + result_passthrough.push(arg); + result_passthrough.push(name); + } + _ => { + if arg.starts_with("-l") { + result_shared_libraries.insert(vec!["lib", &arg[2..], ".so"].concat()); + } + result_passthrough.push(arg) + } + }; + } +} + +fn find_native_libs(args: &Args) -> HashMap<String, PathBuf> { + let mut native_shared_libs: HashMap<String, PathBuf> = HashMap::new(); + + // Add requested .so files + fs::walk_dir(&args.target_path).and_then(|dir_walker| { + for path in dir_walker { + let path = path.unwrap().path(); + match (path.file_name(), path.extension()) { + (Some(filename), Some(ext)) => { + let filename = filename.to_str().unwrap(); + if filename.starts_with("lib") + && ext == "so" + && args.shared_libraries.contains(filename) { + println!("Adding the file {:?}", filename); + native_shared_libs.insert(filename.to_string(), path.clone()); + break; + } + } + _ => {} + } + } + Ok(()) + }).ok(); + + native_shared_libs +} |
