on master help sign in
reenable android
commitdc15730f280c3b389c6bf02f34cfe2d2af44c4b1 authorOwen Shepherd <414owen@gmail.com> dateThu 26 Dec 2019, 17:25 (7 years ago) parented4588b
1 file changed+10−10
lib/selftest/src/Obelisk/SelfTest.hs+10−10
lib/selftest/src/Obelisk/SelfTest.hs+10−10
@@ -164,16 +164,16 @@ main = do
164164 it "can build ghc.backend" $ inTmpObInit $ \_ -> nixBuild ["-A", "ghc.backend"]
165165 it "can build ghcjs.frontend" $ inTmpObInit $ \_ -> nixBuild ["-A", "ghcjs.frontend"]
166166
167− -- if System.Info.os == "darwin"
168− -- then it "can build ios" $ inTmpObInit $ \_ -> nixBuild ["-A", "ios.frontend"]
169− -- else it "can build android after accepting license" $ inTmpObInit $ \dir -> do
170− -- let defaultNixPath = dir </> ("default.nix" :: Shelly.FilePath)
171− -- writefile defaultNixPath
172− -- =<< T.replace
173− -- "# config.android_sdk.accept_license = false;"
174− -- "config.android_sdk.accept_license = true;"
175− -- <$> readfile defaultNixPath
176− -- nixBuild ["-A", "android.frontend"]
167+ if System.Info.os == "darwin"
168+ then it "can build ios" $ inTmpObInit $ \_ -> nixBuild ["-A", "ios.frontend"]
169+ else it "can build android after accepting license" $ inTmpObInit $ \dir -> do
170+ let defaultNixPath = dir </> ("default.nix" :: Shelly.FilePath)
171+ writefile defaultNixPath
172+ =<< T.replace
173+ "# config.android_sdk.accept_license = false;"
174+ "config.android_sdk.accept_license = true;"
175+ <$> readfile defaultNixPath
176+ nixBuild ["-A", "android.frontend"]
177177
178178 forM_ ["ghc", "ghcjs"] $ \compiler -> do
179179 let