git.iko.soy/obelisk
on master help sign in
Provide a way to accept the Android SDK licence agreement
f6b1667Ken Micklas
ChangeLog.md+2−1
compare with master
unifiedsplit
@@ -4,7 +4,8 @@ This project's release branch is `master`. This log is written from the perspect
4
4
5## Unreleased
5## Unreleased
6
6
7−* Fixed crashes of Android apps on 32-bit ARM devices.
7+* Fix crashes of Android apps on 32-bit ARM devices.
8+* Provide a way to indicate acceptance of the Android SDK license by passing `config.android_sdk.accept_license = true;` in the arguments to the import of `.obelisk/impl` in the project's `default.nix`.
8
9
9## v0.1.0.0 - 2019-03-29
10## v0.1.0.0 - 2019-03-29
10
11
README.md+1
@@ -272,6 +272,7 @@ It's also possible to inspect iOS WkWebView apps once they are installed in the
272NOTE: Currently Android builds are only supported on Linux.
272NOTE: Currently Android builds are only supported on Linux.
273
273
2741. In your project's `default.nix` set a suitable value for `android.applicationId` and `android.displayName`.
2741. In your project's `default.nix` set a suitable value for `android.applicationId` and `android.displayName`.
275+1. In your project's `default.nix` pass `config.android_sdk.accept_license = true;` in the arguments to the import of of `.obelisk/impl` to indicate your acceptance of the [Android Software Development Kit License Agreement](https://developer.android.com/studio/terms), which is required to build Android apps.
2751. Run `nix-build -A android.frontend -o result-android` to build the Android app.
2761. Run `nix-build -A android.frontend -o result-android` to build the Android app.
2761. A debug version of the app should be generated at `result-android/android-app-debug.apk`
2771. A debug version of the app should be generated at `result-android/android-app-debug.apk`
277
278
default.nix+2−1
@@ -1,6 +1,7 @@
1{ system ? builtins.currentSystem
1{ system ? builtins.currentSystem
2, profiling ? false
2, profiling ? false
3, iosSdkVersion ? "10.2"
3, iosSdkVersion ? "10.2"
4+, config ? {}
4}:
5}:
5let
6let
6 cleanSource = builtins.filterSource (name: _: let baseName = builtins.baseNameOf name; in !(
7 cleanSource = builtins.filterSource (name: _: let baseName = builtins.baseNameOf name; in !(
@@ -16,7 +17,7 @@ let
16 ];
17 ];
17
18
18 getReflexPlatform = sys: import ./dep/reflex-platform {
19 getReflexPlatform = sys: import ./dep/reflex-platform {
19− inherit iosSdkVersion;
20+ inherit iosSdkVersion config;
20 system = sys;
21 system = sys;
21 enableLibraryProfiling = profiling;
22 enableLibraryProfiling = profiling;
22
23
skeleton/default.nix+7−1
@@ -1,7 +1,13 @@
1{ system ? builtins.currentSystem # TODO: Get rid of this system cruft
1{ system ? builtins.currentSystem # TODO: Get rid of this system cruft
2, iosSdkVersion ? "10.2"
2, iosSdkVersion ? "10.2"
3}:
3}:
4+with import ./.obelisk/impl {
4−with import ./.obelisk/impl { inherit system iosSdkVersion; };
5+ inherit system iosSdkVersion;
6+ # You must accept the Android Software Development Kit License Agreement at
7+ # https://developer.android.com/studio/terms in order to build Android apps.
8+ # Uncomment and set this to `true` to indicate your acceptance:
9+ # config.android_sdk.accept_license = false;
10+};
5project ./. ({ ... }: {
11project ./. ({ ... }: {
6 android.applicationId = "systems.obsidian.obelisk.examples.minimal";
12 android.applicationId = "systems.obsidian.obelisk.examples.minimal";
7 android.displayName = "Obelisk Minimal Example";
13 android.displayName = "Obelisk Minimal Example";