diff --git a/static/build.html b/static/build.html index a8902b9f..4ff43158 100644 --- a/static/build.html +++ b/static/build.html @@ -26,7 +26,7 @@ - +
diff --git a/static/faq.html b/static/faq.html index 4460d064..4b0fcaa6 100644 --- a/static/faq.html +++ b/static/faq.html @@ -26,7 +26,7 @@ - +
@@ -117,6 +117,7 @@
  • How do I install GrapheneOS?
  • How do I build GrapheneOS?
  • How can I donate to GrapheneOS?
    • +
  • Does GrapheneOS make upstream contributions?
  • Will GrapheneOS create a company?
  • Who owns the GrapheneOS code and how is it licensed?
  • What about the GrapheneOS name and logo?
    • @@ -1135,6 +1136,25 @@ support the GrapheneOS project. GrapheneOS is entirely funded by donations.

    +
    +

    Does GrapheneOS make upstream contributions?

    + +

    GrapheneOS has made substantial contributions to the privacy and security of + the Android Open Source Project, along with contributions to the Linux kernel, + LLVM, OpenBSD and other projects. Much of our past work is no longer part of the + downstream GrapheneOS project because we've successfully landed many patches + upstream. We've had even more success with making suggestions and participating in + design discussions to steer things in the direction we want. Many upstream changes + in AOSP such as removing app access to low-level process, network, timing and + profiling information originated in the GrapheneOS project. The needs of the + upstream projects are often different from ours, so they'll often reimplement the + features in a more flexible way. We've almost always been able to move to using + the upstream features and even when we still need our own implementation it helps + to have the concepts/restrictions considered by the upstream project and apps + needing to be compatible with it. Getting features upstream often leads to an + improved user experience and app compatibility.

    +
    +

    Will GrapheneOS create a company?

    diff --git a/static/index.html b/static/index.html index 60b4ee27..60b6e40f 100644 --- a/static/index.html +++ b/static/index.html @@ -26,7 +26,7 @@ - +
    @@ -183,19 +183,9 @@

    Upstream contributions

    -

    GrapheneOS has made substantial contributions to the privacy and security of the - Android Open Source Project, along with contributions to the Linux kernel, LLVM, - OpenBSD and other projects. Much of our past work is no longer part of the downstream - GrapheneOS project because we've successfully landed many patches upstream. We've had - even more success with making suggestions and participating in design discussions to - steer things in the direction we want. Many upstream changes in AOSP such as removing - app access to low-level process, network, timing and profiling information originated - in the GrapheneOS project. The needs of the upstream projects are often different from - ours, so they'll often reimplement the features in a more flexible way. We've almost - always been able to move to using the upstream features and even when we still need - our own implementation it helps to have the concepts/restrictions considered by the - upstream project and apps needing to be compatible with it. Getting features upstream - often leads to an improved user experience and app compatibility.

    +

    See the FAQ section on our upstream work improving + privacy and security for billions of users by getting a subset of our changes into + core infrastructure projects.