From b59d6372dcf57aa5e8bc64be86c1f23554632394 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sat, 19 Mar 2022 16:57:07 -0600
Subject: shenvs: android-dev

---
 shenvs/android-dev.nix | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

(limited to 'shenvs')

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'
+  '';
 }
-- 
cgit v1.2.3