shenvs: android-dev

2 files changed, 34 insertions, 9 deletions

diff --git a/shenvs/android-dev.nix b/shenvs/android-dev.nix
index ce85ae7..cb0d74c 100644
--- a/shenvs/android-dev.nix
+++ b/shenvs/android-dev.nix
@@ -1,11 +1,20 @@
-pkgs: {
-  paths = with pkgs; let
-    android = pkgs.androidenv.composeAndroidPackages {
-	  platformVersions = [ "28" ];
-	  abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
-	  extraLicenses = [];
-	};
-  in [
+# Leer del manual de nixpkgs:
+# 15.2.5. Notes on environment variables in Android projects
+pkgs: let
+  buildToolsVersion = "31.0.0";
+
+  android = (pkgs.androidenv.override {
+    licenseAccepted = true;
+  }).composeAndroidPackages {
+    buildToolsVersions = [ buildToolsVersion ];
+    platformVersions = [ "29" ];
+    abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+    extraLicenses = [];
+  };
+
+  sdkRoot = "${android.androidsdk}/libexec/android-sdk";
+in {
+  paths = with pkgs; [
     (gradleGen.override {
       # all-packages.nix dice esto:
       #   java = pkgs.jdk8; TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
@@ -13,5 +22,16 @@ pkgs: {
     }).gradle_latest
 
     android.androidsdk
+    android.build-tools
+
+    ktlint
   ];
+
+  enter = ''
+    export ANDROID_SDK_ROOT=${sdkRoot}
+    #export ANDROID_NDK_ROOT=ANDROID_SDK_ROOT/ndk-bundle
+
+    # Use the same buildToolsVersion here
+    alias gradle='gradle -Dorg.gradle.project.android.aapt2FromMavenOverride=${sdkRoot}/build-tools/${buildToolsVersion}/aapt2'
+  '';
 }
diff --git a/sys/default.nix b/sys/default.nix
index 3840a30..08b6549 100644
--- a/sys/default.nix
+++ b/sys/default.nix
@@ -295,6 +295,10 @@ in {
       displayManager.startx.enable = true;
     };
 
+    services.udev.packages = [
+      pkgs.android-udev-rules
+    ];
+
     security.pam = {
       oath = {
         usersFile = "/var/trust/users.oath";
@@ -405,7 +409,7 @@ in {
         isNormalUser = true;
         uid = 1000;
         group = "ale";
-        extraGroups = [ "users" "wheel" ];
+        extraGroups = [ "users" "wheel" "adbusers" ];
         shell = pkgs.zsh;
       };
 
@@ -421,6 +425,7 @@ in {
     users.groups = {
       ale.gid = 1001;
       tutorias.gid = 1007;
+      adbusers.gid = 1008;
     };
   };
 }