Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd9e37ed authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'v1-nougat-sprint_istanbul' into 'v1-nougat' 

[RELEASE] Sprint Istanbul

See merge request !7
parents baf4d8b5 df49f1b2

config/common.mk

+35 −5
Original line number Diff line number Diff line
@@ -94,6 +94,34 @@ endif 
PRODUCT_PACKAGES += \

    bootanimation.zip



# Required /e/ packages

PRODUCT_PACKAGES += \

    GmsCore \

		GsfProxy \

		FakeStore \

		com.google.android.maps.jar \

		Mail \

		BlissLauncher \

		BlissIconPack \

		MozillaNlpBackend \

		OpenWeatherMapWeatherProvider \

		AccountManager \

		MagicEarth \

		PdfViewer \

		Camera \

		eDrive \

		Weather \

		Notes \

		Tasks \

		NominatimNlpBackend \

		DroidGuard \

		LibreOfficeViewer \

		OpenKeychain \

		Message \

		Browser \

		BrowserWebView \

		Apps



# Required CM packages

PRODUCT_PACKAGES += \

    BluetoothExt \
@@ -159,6 +187,11 @@ PRODUCT_PACKAGES += \ 
    wget \

    zip



# Custom packages

ifdef CUSTOM_PACKAGES

PRODUCT_PACKAGES += $(CUSTOM_PACKAGES)

endif



# Custom off-mode charger

ifneq ($(WITH_CM_CHARGER),false)

PRODUCT_PACKAGES += \
@@ -226,6 +259,8 @@ PRODUCT_PACKAGES += \ 
endif

endif



PRODUCT_PACKAGE_OVERLAYS := vendor/cm/overlay/microg



DEVICE_PACKAGE_OVERLAYS += vendor/cm/overlay/common



PRODUCT_VERSION_MAJOR = 0
@@ -252,11 +287,6 @@ ifndef CM_BUILDTYPE 
    endif

endif



# Filter out random types, so it'll reset to UNOFFICIAL

ifeq ($(filter RELEASE NIGHTLY SNAPSHOT EXPERIMENTAL,$(CM_BUILDTYPE)),)

    CM_BUILDTYPE :=

endif



ifdef CM_BUILDTYPE

    ifneq ($(CM_BUILDTYPE), SNAPSHOT)

        ifdef CM_EXTRAVERSION

overlay/microg/frameworks/base/core/res/res/values/config.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--Copyright (c) 2012-2016, The Linux Foundation. All rights reserved



    Not a Contribution.



    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.

-->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- Force-enable the location overlays -->

    <bool name="config_enableNetworkLocationOverlay" translatable="false">true</bool>

    <bool name="config_enableFusedLocationOverlay" translatable="false">true</bool>



</resources>