styx: Add GSI target

build/target/product/AndroidProducts.mk

@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2021 The Styx Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/styx_arm64.mk
+
+COMMON_LUNCH_CHOICES := \
+    styx_arm64-eng \
+    styx_arm64-userdebug

build/target/product/styx_arm64.mk

@@ -0,0 +1,30 @@
+# Copyright (C) 2018-2020 The LineageOS Project
+# Copyright (C) 2021 The Styx Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+$(call inherit-product, build/target/product/aosp_arm64.mk)
+$(call inherit-product, build/target/product/gsi_release.mk)
+
+$(call inherit-product, vendor/styx/config/common.mk)
+
+PRODUCT_COPY_FILES += \
+    device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-goldfish.xml \
+
+# Allow building otatools
+TARGET_FORCE_OTA_PACKAGE := true
+
+TARGET_PROVIDES_KERNEL_MAKEFILE := true
+TARGET_NO_KERNEL := true
+
+PRODUCT_NAME := styx_arm64

config/BoardConfigKernel.mk

@@ -95,6 +95,7 @@ endif
 # Needed for CONFIG_COMPAT_VDSO, safe to set for all arm64 builds
 ifeq ($(KERNEL_ARCH),arm64)
    KERNEL_CROSS_COMPILE += CROSS_COMPILE_ARM32="$(KERNEL_TOOLCHAIN_arm)/$(KERNEL_TOOLCHAIN_PREFIX_arm)"
+   KERNEL_CROSS_COMPILE += CROSS_COMPILE_COMPAT="$(KERNEL_TOOLCHAIN_arm)/$(KERNEL_TOOLCHAIN_PREFIX_arm)"
 endif
 
 # Clear this first to prevent accidental poisoning from env

config/common.mk

@@ -22,7 +22,10 @@ $(call inherit-product, vendor/styx/config/versioning.mk)
 # Inherit from our kernel/header generator
 $(call inherit-product, vendor/styx/config/BoardConfigStyx.mk)
 
-# Inherit system packages
+# Inherit from fonts
+$(call inherit-product, vendor/styx/fonts/fonts.mk)
+
+# Inherit prebuilt packages
 $(call inherit-product, vendor/styx/prebuilts/targets.mk)
 
 # Inherit overlays
@@ -31,3 +34,14 @@ $(call inherit-product, vendor/styx/overlay/overlays.mk)
 # Inherit properties
 TARGET_PRODUCT_PROP += vendor/styx/config/properties/product.prop
 TARGET_SYSTEM_PROP += vendor/styx/config/properties/system.prop
+
+# Inherit system packages
+$(call inherit-product, vendor/styx/config/packages.mk)
+
+# Inherit SoC-specific bits
+$(call inherit-product, vendor/styx/soc/soc.mk)
+
+# Inherit GMS
+ifneq ($(TARGET_DISABLES_GMS), true)
+$(call inherit-product-if-exists, vendor/google/gms/config.mk)
+endif

config/packages.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2021 The Styx Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Styles and Wallpapers
+PRODUCT_PACKAGES += \
+    ThemePicker
+
+# GrapheneOS Camera
+PRODUCT_PACKAGES += \
+    Camera

config/properties/system.prop

@@ -10,3 +10,6 @@ dalvik.vm.dex2oat64.enabled=true
 
 # Disable MTE async for system_server
 arm64.memtag.process.system_server=off
+
+# Disable writing to XML as binary.
+persist.sys.binary_xml=false

config/versioning.mk

@@ -18,7 +18,7 @@
 #
 
 PLATFORM_STYX_VERSION_MAJOR := 2.0
-PLATFORM_STYX_VERSION_MINOR := alpha1
+PLATFORM_STYX_VERSION_MINOR := alpha
 PLATFORM_STYX_RELEASE := $(PLATFORM_STYX_VERSION_MAJOR)-$(PLATFORM_STYX_VERSION_MINOR)
 
 TARGET_PRODUCT_SHORT := $(subst styx_,,$(TARGET_DEVICE))

fonts/fira-code/Android.bp

@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2021 The Proton AOSP Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+prebuilt_font {
+    name: "CutiveMono.ttf",
+    src: "FiraCode-Regular_CutiveMono.ttf",
+}
+
+prebuilt_font {
+    name: "DroidSansMono.ttf",
+    src: "FiraCode-Regular_DroidSansMono.ttf",
+}

fonts/fira-code/NOTICE

@@ -0,0 +1,93 @@
+Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

fonts/font_files.mk

@@ -0,0 +1,42 @@
+# Copyright (C) 2021 The Proton AOSP Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := vendor/styx/fonts
+
+# We have to use PRODUCT_PACKAGES (together with BUILD_PREBUILT) instead of
+# PRODUCT_COPY_FILES to install the font files, so that the NOTICE file can
+# get installed too.
+
+PRODUCT_PACKAGES += \
+    CutiveMono.ttf \
+    DroidSansMono.ttf \
+    Roboto-Regular.ttf \
+    Manrope-VF.ttf \
+    NotoSans-Italic-VF.ttf \
+    NotoSans-VF.ttf \
+    Recursive-VF.ttf \
+    RobotoFallback-VF.ttf \
+    RobotoSystem-VF.ttf \
+    RobotoStatic-Regular.ttf \
+    SourceSans3-Italic-VF.otf \
+    SourceSans3-VF.otf \
+    NotoSerif-BoldItalic.ttf \
+    NotoSerif-Bold.ttf \
+    NotoSerif-Italic.ttf \
+    NotoSerif-Regular.ttf \
+
+# Register new fonts
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/fonts_customization.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/fonts_customization.xml \
+

fonts/fonts.mk

@@ -0,0 +1,34 @@
+# Copyright (C) 2021 The Proton AOSP Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := vendor/styx/fonts
+
+# Copy font files
+include vendor/styx/fonts/font_files.mk
+
+# Register custom fonts
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/fonts_customization.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/fonts_customization.xml \
+
+# Overlays for UI font styles
+PRODUCT_PACKAGES += \
+    FontHKGroteskOverlay \
+    FontManropeOverlay \
+    FontNotoSansOverlay \
+    FontRecursiveCasualOverlay \
+    FontRecursiveLinearOverlay \
+    FontRobotoOverlay \
+    FontSourceSansOverlay \
+    FontSourceSerifOverlay \
+    FontHarmonyOSSansOverlay \