Skip to content
Snippets Groups Projects
Commit 34eae9c1 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Get our aapt2 used

parent ad45cb3d
No related branches found
No related tags found
No related merge requests found
...@@ -20,4 +20,12 @@ kotlin.code.style=official ...@@ -20,4 +20,12 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the # Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies, # resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library # thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true android.nonTransitiveRClass=true
\ No newline at end of file
# What an atrocious path, you say. Well, yes. It doesn't make a ton of sense
# to have this checked in. However, it seems like the other properties here
# should be checked in and also this setting seems to *have* to go in this
# file (instead of, say, local.properties). The devShell provided by the
# flake will rewrite this path at activation time if it needs to be different!
# So maybe focus on bigger problems for a while.
android.aapt2FromMavenOverride=/nix/store/n7mv52lj2alq2gkys0skwwgs6c7s1cyl-androidsdk/libexec/android-sdk/build-tools/31.0.0/aapt2
...@@ -166,6 +166,8 @@ ...@@ -166,6 +166,8 @@
sdk.dir=${ANDROIDSDK} sdk.dir=${ANDROIDSDK}
sed -i -e s,aapt2FromMavenOverride=.*,aapt2FromMavenOverride=${ANDROIDSDK}/build-tools/${buildToolsVersion}/aapt2, app/gradle.properties
# This probably needs to be set somewhere, but perhaps not here? # This probably needs to be set somewhere, but perhaps not here?
# #
# > [CXX5106] NDK was located by using ndk.dir property. This method # > [CXX5106] NDK was located by using ndk.dir property. This method
...@@ -176,14 +178,6 @@ ...@@ -176,14 +178,6 @@
# android.ndkVersion=${ndkVersion} # android.ndkVersion=${ndkVersion}
EOF EOF
''; '';
# cat >app/app/gradle.properties <<EOF
# # THIS FILE IS AUTOMATICALLY GENERATED
# # DO NOT EDIT
# # YOUR CHANGES WILL BE DESTROYED
# android.aapt2FromMavenOverride=${ANDROIDSDK}/build-tools/30.0.3/aapt2
# EOF
}; };
devShells.default = self.devShells.${system}.gradle; devShells.default = self.devShells.${system}.gradle;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment