diff options
| author | nyquist <nyquist@chromium.org> | 2016-02-02 14:22:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-02 22:25:10 +0000 |
| commit | 02b5e755bceffa16f490fc93cc4f7d236bceb7d1 (patch) | |
| tree | 2f4ff9a54dab132664e3650f28edd44f1ebc2ee0 /blimp/client | |
| parent | 4d3c989f02ae9b9bd5c183a56715e4aaca808d14 (diff) | |
| download | chromium_src-02b5e755bceffa16f490fc93cc4f7d236bceb7d1.zip chromium_src-02b5e755bceffa16f490fc93cc4f7d236bceb7d1.tar.gz chromium_src-02b5e755bceffa16f490fc93cc4f7d236bceb7d1.tar.bz2 | |
Simplify buildbot setup and add icon for blimp
This CL adds the possibility to override the manifest package for the
blimp APK using GN args.
In addition, it adds a simple icon.
BUG=None
NOTRY=true
Review URL: https://codereview.chromium.org/1658353002
Cr-Commit-Position: refs/heads/master@{#373058}
Diffstat (limited to 'blimp/client')
| -rw-r--r-- | blimp/client/BUILD.gn | 7 | ||||
| -rw-r--r-- | blimp/client/app/android/AndroidManifest.xml.jinja2 | 3 | ||||
| -rw-r--r-- | blimp/client/app/android/java/res/mipmap-hdpi/app_icon.png | bin | 0 -> 1654 bytes | |||
| -rw-r--r-- | blimp/client/app/android/java/res/mipmap-mdpi/app_icon.png | bin | 0 -> 1054 bytes | |||
| -rw-r--r-- | blimp/client/app/android/java/res/mipmap-xhdpi/app_icon.png | bin | 0 -> 2373 bytes | |||
| -rw-r--r-- | blimp/client/app/android/java/res/mipmap-xxhdpi/app_icon.png | bin | 0 -> 3903 bytes | |||
| -rw-r--r-- | blimp/client/app/android/java/res/mipmap-xxxhdpi/app_icon.png | bin | 0 -> 5901 bytes |
7 files changed, 8 insertions, 2 deletions
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn index f0c5880..71adf03 100644 --- a/blimp/client/BUILD.gn +++ b/blimp/client/BUILD.gn @@ -137,7 +137,12 @@ if (is_linux && !is_chromeos && use_x11) { } if (is_android) { - manifest_package = "org.chromium.blimp" + declare_args() { + # Package name used in the manifest for the Blimp APK. + blimp_package_name = "org.chromium.blimp" + } + + manifest_package = blimp_package_name blimp_apk_manifest = "$target_gen_dir/blimp_apk_manifest/AndroidManifest.xml" blimp_test_apk_manifest = "$target_gen_dir/blimp_test_apk_manifest/AndroidManifest.xml" diff --git a/blimp/client/app/android/AndroidManifest.xml.jinja2 b/blimp/client/app/android/AndroidManifest.xml.jinja2 index 2a59b72..64d1122 100644 --- a/blimp/client/app/android/AndroidManifest.xml.jinja2 +++ b/blimp/client/app/android/AndroidManifest.xml.jinja2 @@ -13,7 +13,8 @@ <uses-permission android:name="android.permission.GET_ACCOUNTS"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <application android:name="BlimpApplication" - android:label="Blimp"> + android:label="Blimp" + android:icon="@mipmap/app_icon"> <activity android:name="BlimpRendererActivity" android:launchMode="singleTask" android:theme="@android:style/Theme.Holo.Light.NoActionBar" diff --git a/blimp/client/app/android/java/res/mipmap-hdpi/app_icon.png b/blimp/client/app/android/java/res/mipmap-hdpi/app_icon.png Binary files differnew file mode 100644 index 0000000..484cdfa --- /dev/null +++ b/blimp/client/app/android/java/res/mipmap-hdpi/app_icon.png diff --git a/blimp/client/app/android/java/res/mipmap-mdpi/app_icon.png b/blimp/client/app/android/java/res/mipmap-mdpi/app_icon.png Binary files differnew file mode 100644 index 0000000..71420ee --- /dev/null +++ b/blimp/client/app/android/java/res/mipmap-mdpi/app_icon.png diff --git a/blimp/client/app/android/java/res/mipmap-xhdpi/app_icon.png b/blimp/client/app/android/java/res/mipmap-xhdpi/app_icon.png Binary files differnew file mode 100644 index 0000000..17bab57d --- /dev/null +++ b/blimp/client/app/android/java/res/mipmap-xhdpi/app_icon.png diff --git a/blimp/client/app/android/java/res/mipmap-xxhdpi/app_icon.png b/blimp/client/app/android/java/res/mipmap-xxhdpi/app_icon.png Binary files differnew file mode 100644 index 0000000..7ecf139 --- /dev/null +++ b/blimp/client/app/android/java/res/mipmap-xxhdpi/app_icon.png diff --git a/blimp/client/app/android/java/res/mipmap-xxxhdpi/app_icon.png b/blimp/client/app/android/java/res/mipmap-xxxhdpi/app_icon.png Binary files differnew file mode 100644 index 0000000..96d9cc3 --- /dev/null +++ b/blimp/client/app/android/java/res/mipmap-xxxhdpi/app_icon.png |
