on master help sign in
reenable android
commit6fbea744aa2b9b2dc4aac1f873ce68857914451f authorOwen Shepherd <414owen@gmail.com> dateMon 6 Jan 2020, 18:28 (7 years ago) parent5a6965c
1 file changed+10−10
lib/selftest/src/Obelisk/SelfTest.hs+10−10
lib/selftest/src/Obelisk/SelfTest.hs+10−10
@@ -179,16 +179,16 @@ main = do
179179 it "can build ghc.backend" $ inTmpObInit $ \_ -> nixBuild ["-A", "ghc.backend"]
180180 it "can build ghcjs.frontend" $ inTmpObInit $ \_ -> nixBuild ["-A", "ghcjs.frontend"]
181181
182− -- if System.Info.os == "darwin"
183− -- then it "can build ios" $ inTmpObInit $ \_ -> nixBuild ["-A", "ios.frontend"]
184− -- else it "can build android after accepting license" $ inTmpObInit $ \dir -> do
185− -- let defaultNixPath = dir </> ("default.nix" :: FilePath)
186− -- writefile defaultNixPath
187− -- =<< T.replace
188− -- "# config.android_sdk.accept_license = false;"
189− -- "config.android_sdk.accept_license = true;"
190− -- <$> readfile defaultNixPath
191− -- nixBuild ["-A", "android.frontend"]
182+ if System.Info.os == "darwin"
183+ then it "can build ios" $ inTmpObInit $ \_ -> nixBuild ["-A", "ios.frontend"]
184+ else it "can build android after accepting license" $ inTmpObInit $ \dir -> do
185+ let defaultNixPath = dir </> ("default.nix" :: FilePath)
186+ writefile defaultNixPath
187+ =<< T.replace
188+ "# config.android_sdk.accept_license = false;"
189+ "config.android_sdk.accept_license = true;"
190+ <$> readfile defaultNixPath
191+ nixBuild ["-A", "android.frontend"]
192192
193193 forM_ ["ghc", "ghcjs"] $ \compiler -> do
194194 let